Merge branch 'incremental_tg' r5067 into bs12_with_tgport

removed extraneous admin attack messages, temporarily disabled much moderator stuff (will be re-enabled in future updates) Conflicts: baystation12.dme code/__HELPERS/type2type.dm code/controllers/configuration.dm code/datums/datumvars.dm code/datums/helper_datums/getrev.dm code/defines/obj.dm code/game/gamemodes/events/black_hole.dm code/game/gamemodes/events/space_ninja.dm code/game/gamemodes/wizard/rightandwrong.dm code/game/jobs/job/captain.dm code/game/jobs/job/job.dm code/game/jobs/job_controller.dm code/game/machinery/bots/medbot.dm code/game/machinery/computer/card.dm code/game/machinery/telecomms/traffic_control.dm code/game/machinery/turrets.dm code/game/machinery/wishgranter.dm code/game/objects/items/blueprints.dm code/game/objects/items/devices/uplinks.dm code/game/objects/items/stacks/stack.dm code/game/objects/items/weapons/surgery_tools.dm code/game/turfs/turf.dm code/game/verbs/ooc.dm code/global.dm code/modules/admin/IsBanned.dm code/modules/admin/admin.dm code/modules/admin/admin_memo.dm code/modules/admin/admin_verbs.dm code/modules/admin/holder2.dm code/modules/admin/player_panel.dm code/modules/admin/verbs/adminpm.dm code/modules/admin/verbs/diagnostics.dm code/modules/assembly/igniter.dm code/modules/client/client defines.dm code/modules/client/client procs.dm code/modules/clothing/spacesuits/miscellaneous.dm code/modules/clothing/suits/armor.dm code/modules/clothing/suits/jobs.dm code/modules/mining/mine_turfs.dm code/modules/mob/living/carbon/human/say.dm code/modules/mob/living/carbon/human/update_icons.dm code/modules/mob/living/living.dm code/modules/mob/living/living_defense.dm code/modules/mob/living/silicon/robot/emote.dm code/modules/mob/living/silicon/robot/life.dm code/modules/mob/mob_cleanup.dm code/modules/mob/new_player/new_player.dm code/modules/mob/new_player/preferences.dm code/modules/paperwork/paper.dm code/modules/paperwork/photocopier.dm code/modules/projectiles/guns/projectile/automatic.dm code/modules/reagents/Chemistry-Machinery.dm code/setup.dm code/stylesheet.dm code/world.dm config/admins.txt config/config.txt html/changelog.html icons/mob/items_lefthand.dmi icons/mob/items_righthand.dmi icons/mob/suit.dmi icons/obj/clothing/suits.dmi icons/turf/areas.dmi Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2026-08-23 03:57:13 +01:00 · 2012-12-28 14:13:11 +10:00
parent 29ff212265 15e001d19d
commit 31349fb7d3
341 changed files with 17940 additions and 16947 deletions
@@ -9,6 +9,7 @@
 	say_message = "hisses"
 	icon = 'icons/mob/alien.dmi'
 	gender = NEUTER
+	dna = null

 	var/storedPlasma = 250
 	var/max_plasma = 500
@@ -36,7 +37,7 @@

 /mob/living/carbon/alien/adjustFireLoss(amount) // Weak to Fire
 	if(amount > 0)
-		..(amount * 1.5)
+		..(amount * 2)
 	else
 		..(amount)
 	return
@@ -172,6 +173,11 @@
 		move_delay_add = min(move_delay_add + round(amount / 2), 10) // a maximum delay of 10
 	return

+/mob/living/carbon/alien/getDNA()
+	return null
+
+/mob/living/carbon/alien/setDNA()
+	return

 /*----------------------------------------
 Proc: AddInfectionImages()
@@ -197,6 +203,7 @@ Des: Removes all infected images from the alien.
 				del(I)
 	return

+
 #undef HEAT_DAMAGE_LEVEL_1
 #undef HEAT_DAMAGE_LEVEL_2
 #undef HEAT_DAMAGE_LEVEL_3
@@ -5,6 +5,9 @@
 		var/t1 = findtext(act, "-", 1, null)
 		param = copytext(act, t1 + 1, length(act) + 1)
 		act = copytext(act, 1, t1)
+
+	if(findtext(act,"s",-1) && !findtext(act,"_",-2))//Removes ending s's unless they are prefixed with a '_'
+		act = copytext(act,1,length(act))
 	var/muzzled = istype(src.wear_mask, /obj/item/clothing/mask/muzzle)
 	var/m_type = 1
 	var/message
@@ -6,7 +6,7 @@
 	health = 250
 	icon_state = "alienq_s"
 	nopush = 1
-	heal_rate = 10 // Let's regenerate more than our average underling.
+	heal_rate = 5
 	plasma_rate = 20


@@ -5,6 +5,9 @@
 		var/t1 = findtext(act, "-", 1, null)
 		param = copytext(act, t1 + 1, length(act) + 1)
 		act = copytext(act, 1, t1)
+
+	if(findtext(act,"s",-1) && !findtext(act,"_",-2))//Removes ending s's unless they are prefixed with a '_'
+		act = copytext(act,1,length(act))
 	var/muzzled = istype(src.wear_mask, /obj/item/clothing/mask/muzzle)
 	var/m_type = 1
 	var/message
@@ -84,6 +84,10 @@ var/const/MAX_ACTIVE_TIME = 400
 	HasProximity(target)
 	return

+/obj/item/clothing/mask/facehugger/on_found(mob/finder as mob)
+	HasProximity(finder)
+	return 1
+
 /obj/item/clothing/mask/facehugger/dropped()
 	..()
 	GoActive()
@@ -6,6 +6,9 @@
 		var/t1 = findtext(act, "-", 1, null)
 		act = copytext(act, 1, t1)

+	if(findtext(act,"s",-1) && !findtext(act,"_",-2))//Removes ending s's unless they are prefixed with a '_'
+		act = copytext(act,1,length(act))
+
 	if(src.stat == DEAD)
 		return
 	switch(act)
@@ -329,6 +329,9 @@
 									target_vent = vent_found 	//travel back. No additional time required.
 									src << "\red The vent you were heading to appears to be welded."
 								loc = target_vent.loc
+								var/area/new_area = get_area(loc)
+								if(new_area)
+									new_area.Entered(src)

 					else
 						src << "You need to remain still while entering a vent."
@@ -416,8 +419,6 @@
 				usr.attack_log += text("\[[time_stamp()]\] <font color='red'>Has thrown [M.name] ([M.ckey]) from [start_T_descriptor] with the target [end_T_descriptor]</font>")

 				log_attack("<font color='red'>[usr.name] ([usr.ckey]) Has thrown [M.name] ([M.ckey]) from [start_T_descriptor] with the target [end_T_descriptor]</font>")
-				log_admin("ATTACK: [usr.name] ([usr.ckey]) Has thrown [M.name] ([M.ckey]) from [start_T_descriptor] with the target [end_T_descriptor]")
-				msg_admin_attack("ATTACK: [usr.name] ([usr.ckey]) Has thrown [M.name] ([M.ckey]) from [start_T_descriptor] with the target [end_T_descriptor]")

 	if(!item) return //Grab processing has a chance of returning null

@@ -6,6 +6,9 @@
 		param = copytext(act, t1 + 1, length(act) + 1)
 		act = copytext(act, 1, t1)

+	if(findtext(act,"s",-1) && !findtext(act,"_",-2))//Removes ending s's unless they are prefixed with a '_'
+		act = copytext(act,1,length(act))
+
 	var/muzzled = istype(src.wear_mask, /obj/item/clothing/mask/muzzle)
 	//var/m_type = 1

@@ -50,17 +53,27 @@
 			var/input = copytext(sanitize(input("Choose an emote to display.") as text|null),1,MAX_MESSAGE_LEN)
 			if (!input)
 				return
-			var/input2 = input("Is this a visible or hearable emote?") in list("Visible","Hearable")
-			if (input2 == "Visible")
-				m_type = 1
-			else if (input2 == "Hearable")
-				if (src.miming)
-					return
-				m_type = 2
-			else
-				alert("Unable to use this emote, must be either hearable or visible.")
+			if(copytext(input,1,5) == "says")
+				src << "\red Invalid emote."
 				return
-			message = "<B>[src]</B> [input]"
+			else if(copytext(input,1,9) == "exclaims")
+				src << "\red Invalid emote."
+				return
+			else if(copytext(input,1,5) == "asks")
+				src << "\red Invalid emote."
+				return
+			else
+				var/input2 = input("Is this a visible or hearable emote?") in list("Visible","Hearable")
+				if (input2 == "Visible")
+					m_type = 1
+				else if (input2 == "Hearable")
+					if (src.miming)
+						return
+					m_type = 2
+				else
+					alert("Unable to use this emote, must be either hearable or visible.")
+					return
+				message = "<B>[src]</B> [input]"

 		if ("me")
 			if(silent)
@@ -75,6 +88,15 @@
 				return
 			if(!(message))
 				return
+			if(copytext(message,1,5) == "says")
+				src << "\red Invalid emote."
+				return
+			else if(copytext(message,1,9) == "exclaims")
+				src << "\red Invalid emote."
+				return
+			else if(copytext(message,1,5) == "asks")
+				src << "\red Invalid emote."
+				return
 			else
 				message = "<B>[src]</B> [message]"

@@ -96,26 +118,36 @@
 			m_type = 1

 		if ("choke")
-			if (!muzzled)
-				message = "<B>[src]</B> chokes!"
-				m_type = 2
+			if(miming)
+				message = "<B>[src]</B> clutches his throat desperately!"
+				m_type = 1
 			else
-				message = "<B>[src]</B> makes a strong noise."
-				m_type = 2
+				if (!muzzled)
+					message = "<B>[src]</B> chokes!"
+					m_type = 2
+				else
+					message = "<B>[src]</B> makes a strong noise."
+					m_type = 2

 		if ("clap")
 			if (!src.restrained())
 				message = "<B>[src]</B> claps."
 				m_type = 2
+				if(miming)
+					m_type = 1
 		if ("flap")
 			if (!src.restrained())
 				message = "<B>[src]</B> flaps his wings."
 				m_type = 2
+				if(miming)
+					m_type = 1

 		if ("aflap")
 			if (!src.restrained())
 				message = "<B>[src]</B> flaps his wings ANGRILY!"
 				m_type = 2
+				if(miming)
+					m_type = 1

 		if ("drool")
 			message = "<B>[src]</B> drools."
@@ -126,12 +158,16 @@
 			m_type = 1

 		if ("chuckle")
-			if (!muzzled)
-				message = "<B>[src]</B> chuckles."
-				m_type = 2
+			if(miming)
+				message = "<B>[src]</B> appears to chuckle."
+				m_type = 1
 			else
-				message = "<B>[src]</B> makes a noise."
-				m_type = 2
+				if (!muzzled)
+					message = "<B>[src]</B> chuckles."
+					m_type = 2
+				else
+					message = "<B>[src]</B> makes a noise."
+					m_type = 2

 		if ("twitch")
 			message = "<B>[src]</B> twitches violently."
@@ -149,12 +185,16 @@
 			m_type = 1

 		if ("cough")
-			if (!muzzled)
-				message = "<B>[src]</B> coughs!"
-				m_type = 2
+			if(miming)
+				message = "<B>[src]</B> appears to cough!"
+				m_type = 1
 			else
-				message = "<B>[src]</B> makes a strong noise."
-				m_type = 2
+				if (!muzzled)
+					message = "<B>[src]</B> coughs!"
+					m_type = 2
+				else
+					message = "<B>[src]</B> makes a strong noise."
+					m_type = 2

 		if ("frown")
 			message = "<B>[src]</B> frowns."
@@ -173,24 +213,32 @@
 			m_type = 1

 		if ("gasp")
-			if (!muzzled)
-				message = "<B>[src]</B> gasps!"
-				m_type = 2
+			if(miming)
+				message = "<B>[src]</B> appears to be gasping!"
+				m_type = 1
 			else
-				message = "<B>[src]</B> makes a weak noise."
-				m_type = 2
+				if (!muzzled)
+					message = "<B>[src]</B> gasps!"
+					m_type = 2
+				else
+					message = "<B>[src]</B> makes a weak noise."
+					m_type = 2

 		if ("deathgasp")
 			message = "<B>[src]</B> seizes up and falls limp, \his eyes dead and lifeless..."
 			m_type = 1

 		if ("giggle")
-			if (!muzzled)
-				message = "<B>[src]</B> giggles."
-				m_type = 2
+			if(miming)
+				message = "<B>[src]</B> giggles silently!"
+				m_type = 1
 			else
-				message = "<B>[src]</B> makes a noise."
-				m_type = 2
+				if (!muzzled)
+					message = "<B>[src]</B> giggles."
+					m_type = 2
+				else
+					message = "<B>[src]</B> makes a noise."
+					m_type = 2

 		if ("glare")
 			var/M = null
@@ -244,34 +292,51 @@
 			m_type = 1

 		if ("cry")
-			if (!muzzled)
+			if(miming)
 				message = "<B>[src]</B> cries."
-				m_type = 2
+				m_type = 1
 			else
-				message = "<B>[src]</B> makes a weak noise. \He frowns."
-				m_type = 2
+				if (!muzzled)
+					message = "<B>[src]</B> cries."
+					m_type = 2
+				else
+					message = "<B>[src]</B> makes a weak noise. \He frowns."
+					m_type = 2

 		if ("sigh")
-			if (!muzzled)
+			if(miming)
 				message = "<B>[src]</B> sighs."
-				m_type = 2
+				m_type = 1
 			else
-				message = "<B>[src]</B> makes a weak noise."
-				m_type = 2
+				if (!muzzled)
+					message = "<B>[src]</B> sighs."
+					m_type = 2
+				else
+					message = "<B>[src]</B> makes a weak noise."
+					m_type = 2

 		if ("laugh")
-			if (!muzzled)
-				message = "<B>[src]</B> laughs."
-				m_type = 2
+			if(miming)
+				message = "<B>[src]</B> acts out a laugh."
+				m_type = 1
 			else
-				message = "<B>[src]</B> makes a noise."
-				m_type = 2
+				if (!muzzled)
+					message = "<B>[src]</B> laughs."
+					m_type = 2
+				else
+					message = "<B>[src]</B> makes a noise."
+					m_type = 2

 		if ("mumble")
 			message = "<B>[src]</B> mumbles!"
 			m_type = 2
+			if(miming)
+				m_type = 1

 		if ("grumble")
+			if(miming)
+				message = "<B>[src]</B> grumbles!"
+				m_type = 1
 			if (!muzzled)
 				message = "<B>[src]</B> grumbles!"
 				m_type = 2
@@ -280,16 +345,24 @@
 				m_type = 2

 		if ("groan")
-			if (!muzzled)
-				message = "<B>[src]</B> groans!"
-				m_type = 2
+			if(miming)
+				message = "<B>[src]</B> appears to groan!"
+				m_type = 1
 			else
-				message = "<B>[src]</B> makes a loud noise."
-				m_type = 2
+				if (!muzzled)
+					message = "<B>[src]</B> groans!"
+					m_type = 2
+				else
+					message = "<B>[src]</B> makes a loud noise."
+					m_type = 2

 		if ("moan")
-			message = "<B>[src]</B> moans!"
-			m_type = 2
+			if(miming)
+				message = "<B>[src]</B> appears to moan!"
+				m_type = 1
+			else
+				message = "<B>[src]</B> moans!"
+				m_type = 2

 		if ("johnny")
 			var/M
@@ -298,8 +371,12 @@
 			if (!M)
 				param = null
 			else
-				message = "<B>[src]</B> says, \"[M], please. He had a family.\" [src.name] takes a drag from a cigarette and blows his name out in smoke."
-				m_type = 2
+				if(miming)
+					message = "<B>[src]</B> takes a drag from a cigarette and blows \"[M]\" out in smoke."
+					m_type = 1
+				else
+					message = "<B>[src]</B> says, \"[M], please. He had a family.\" [src.name] takes a drag from a cigarette and blows his name out in smoke."
+					m_type = 2

 		if ("point")
 			if (!src.restrained())
@@ -350,6 +427,8 @@
 		if ("shiver")
 			message = "<B>[src]</B> shivers."
 			m_type = 2
+			if(miming)
+				m_type = 1

 		if ("pale")
 			message = "<B>[src]</B> goes pale for a second."
@@ -360,32 +439,46 @@
 			m_type = 1

 		if ("sneeze")
-			if (!muzzled)
+			if (miming)
 				message = "<B>[src]</B> sneezes."
-				m_type = 2
+				m_type = 1
 			else
-				message = "<B>[src]</B> makes a strange noise."
-				m_type = 2
+				if (!muzzled)
+					message = "<B>[src]</B> sneezes."
+					m_type = 2
+				else
+					message = "<B>[src]</B> makes a strange noise."
+					m_type = 2

 		if ("sniff")
 			message = "<B>[src]</B> sniffs."
 			m_type = 2
+			if(miming)
+				m_type = 1

 		if ("snore")
-			if (!muzzled)
-				message = "<B>[src]</B> snores."
-				m_type = 2
+			if (miming)
+				message = "<B>[src]</B> sleeps soundly."
+				m_type = 1
 			else
-				message = "<B>[src]</B> makes a noise."
-				m_type = 2
+				if (!muzzled)
+					message = "<B>[src]</B> snores."
+					m_type = 2
+				else
+					message = "<B>[src]</B> makes a noise."
+					m_type = 2

 		if ("whimper")
-			if (!muzzled)
-				message = "<B>[src]</B> whimpers."
-				m_type = 2
+			if (miming)
+				message = "<B>[src]</B> appears hurt."
+				m_type = 1
 			else
-				message = "<B>[src]</B> makes a weak noise."
-				m_type = 2
+				if (!muzzled)
+					message = "<B>[src]</B> whimpers."
+					m_type = 2
+				else
+					message = "<B>[src]</B> makes a weak noise."
+					m_type = 2

 		if ("wink")
 			message = "<B>[src]</B> winks."
@@ -395,11 +488,15 @@
 			if (!muzzled)
 				message = "<B>[src]</B> yawns."
 				m_type = 2
+				if(miming)
+					m_type = 1

 		if ("collapse")
 			Paralyse(2)
 			message = "<B>[src]</B> collapses!"
 			m_type = 2
+			if(miming)
+				m_type = 1

 		if("hug")
 			m_type = 1
@@ -436,7 +533,7 @@
 					else
 						message = "<B>[src]</B> holds out \his hand to [M]."

-		if("daps")
+		if("dap")
 			m_type = 1
 			if (!src.restrained())
 				var/M = null
@@ -451,12 +548,16 @@
 					message = "<B>[src]</B> sadly can't find anybody to give daps to, and daps \himself. Shameful."

 		if ("scream")
-			if (!muzzled)
-				message = "<B>[src]</B> screams!"
-				m_type = 2
+			if (miming)
+				message = "<B>[src]</B> acts out a scream!"
+				m_type = 1
 			else
-				message = "<B>[src]</B> makes a very loud noise."
-				m_type = 2
+				if (!muzzled)
+					message = "<B>[src]</B> screams!"
+					m_type = 2
+				else
+					message = "<B>[src]</B> makes a very loud noise."
+					m_type = 2

 		if ("help")
 			src << "blink, blink_r, blush, bow-(none)/mob, burp, choke, chuckle, clap, collapse, cough,\ncry, custom, deathgasp, drool, eyebrow, frown, gasp, giggle, groan, grumble, handshake, hug-(none)/mob, glare-(none)/mob,\ngrin, laugh, look-(none)/mob, moan, mumble, nod, pale, point-atom, raise, salute, shake, shiver, shrug,\nsigh, signal-#1-10, smile, sneeze, sniff, snore, stare-(none)/mob, tremble, twitch, twitch_s, whimper,\nwink, yawn"
@@ -5,9 +5,7 @@

 	switch(M.a_intent)
 		if ("help")
-			for(var/mob/O in viewers(src, null))
-				if ((O.client && !( O.blinded )))
-					O.show_message(text("\blue [M] caresses [src] with its scythe like arm."), 1)
+			visible_message(text("\blue [M] caresses [src] with its scythe like arm."))
 		if ("grab")
 			if(M == src)	return
 			if (w_uniform)
@@ -21,9 +19,7 @@
 			LAssailant = M

 			playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
-			for(var/mob/O in viewers(src, null))
-				if ((O.client && !( O.blinded )))
-					O.show_message(text("\red [] has grabbed [] passively!", M, src), 1)
+			visible_message(text("\red [] has grabbed [] passively!", M, src))

 		if("hurt")
 			if (w_uniform)
@@ -47,22 +43,16 @@

 		if("disarm")
 			var/randn = rand(1, 100)
-			if (randn <= 90)
+			if (randn <= 80)
 				playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1)
 				Weaken(10)
-				for(var/mob/O in viewers(src, null))
-					if ((O.client && !( O.blinded )))
-						O.show_message(text("\red <B>[] has tackled down []!</B>", M, src), 1)
+				visible_message(text("\red <B>[] has tackled down []!</B>", M, src))
 			else
 				if (randn <= 99)
 					playsound(loc, 'sound/weapons/slash.ogg', 25, 1, -1)
 					drop_item()
-					for(var/mob/O in viewers(src, null))
-						if ((O.client && !( O.blinded )))
-							O.show_message(text("\red <B>[] disarmed []!</B>", M, src), 1)
+					visible_message(text("\red <B>[] disarmed []!</B>", M, src))
 				else
 					playsound(loc, 'sound/weapons/slashmiss.ogg', 50, 1, -1)
-					for(var/mob/O in viewers(src, null))
-						if ((O.client && !( O.blinded )))
-							O.show_message(text("\red <B>[] has tried to disarm []!</B>", M, src), 1)
+					visible_message(text("\red <B>[] has tried to disarm []!</B>", M, src))
 	return
@@ -20,9 +20,6 @@
 					M.attack_log += text("\[[time_stamp()]\] <font color='red'>Stungloved [src.name] ([src.ckey])</font>")
 					src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been stungloved by [M.name] ([M.ckey])</font>")

-					log_admin("ATTACK: [M.name] ([M.ckey]) stungloved [src.name] ([src.ckey])")
-					msg_admin_attack("ATTACK: [M.name] ([M.ckey]) stungloved [src.name] ([src.ckey])") //BS12 EDIT ALG
-
 					log_attack("<font color='red'>[M.name] ([M.ckey]) stungloved [src.name] ([src.ckey])</font>")

 					var/armorblock = run_armor_check(M.zone_sel.selecting, "energy")
@@ -112,9 +109,6 @@
 				M.attack_log += text("\[[time_stamp()]\] <font color='red'>Used Electric Hands nanoaug power on [src.name] ([src.ckey])</font>")
 				src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been shocked by [M.name] with the Electric Hands nanoaug ([M.ckey])</font>")

-				log_admin("ATTACK: [M.name] ([M.ckey]) used Electric Hands nanoaug on [src.name] ([src.ckey]), shocking them")
-				msg_admin_attack("ATTACK: [M.name] ([M.ckey]) used Electric Hands nanoaug on [src.name] ([src.ckey]), shocking them") //BS12 EDIT ALG
-
 				log_attack("<font color='red'>[M.name] ([M.ckey]) used Electric Hands nanoaug on [src.name]([src.ckey]), shocking them </font>")

 				var/armorblock = run_armor_check(M.zone_sel.selecting, "energy")
@@ -137,9 +131,6 @@
 			M.attack_log += text("\[[time_stamp()]\] <font color='red'>[attack_verb]ed [src.name] ([src.ckey])</font>")
 			src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been [attack_verb]ed by [M.name] ([M.ckey])</font>")

-			log_admin("ATTACK: [M.name] ([M.ckey]) [attack_verb]ed [src.name] ([src.ckey])")
-			msg_admin_attack("ATTACK: [M.name] ([M.ckey]) [attack_verb]ed [src.name] ([src.ckey])") //BS12 EDIT ALG
-
 			log_attack("<font color='red'>[M.name] ([M.ckey]) [attack_verb]ed [src.name] ([src.ckey])</font>")

 			var/damage = rand(0, 5)//BS12 EDIT
@@ -409,6 +409,9 @@
 			if("legcuff")
 				message = "\red <B>[source] is trying to unlegcuff [target]!</B>"
 			if("uniform")
+				for(var/obj/item/I in list(target.l_store, target.r_store))
+					if(I.on_found(source))
+						return
 				if(target.w_uniform && !target.w_uniform.canremove)
 					message = "\red <B>[source] fails to take off \a [target.w_uniform] from [target]'s body!</B>"
 				else
@@ -416,19 +419,8 @@
 			if("s_store")
 				message = "\red <B>[source] is trying to take off \a [target.s_store] from [target]'s suit!</B>"
 			if("pockets")
-				for(var/obj/item/weapon/mousetrap/MT in  list(target.l_store, target.r_store))
-					if(MT.armed)
-						for(var/mob/O in viewers(target, null))
-							if(O == source)
-								O.show_message("\red <B>You reach into the [target]'s pockets, but there was a live mousetrap in there!</B>", 1)
-							else
-								O.show_message("\red <B>[source] reaches into [target]'s pockets and sets off a hidden mousetrap!</B>", 1)
-						target.u_equip(MT)
-						if (target.client)
-							target.client.screen -= MT
-						MT.loc = source.loc
-						MT.triggered(source, source.hand ? "l_hand" : "r_hand")
-						MT.layer = OBJ_LAYER
+				for(var/obj/item/I in list(target.l_store, target.r_store))
+					if(I.on_found(source))
 						return
 				message = "\red <B>[source] is trying to empty [target]'s pockets.</B>"
 			if("CPR")
@@ -8,23 +8,24 @@
 #define HEAT_DAMAGE_LEVEL_2 4 //Amount of damage applied when your body temperature passes the 400K point
 #define HEAT_DAMAGE_LEVEL_3 8 //Amount of damage applied when your body temperature passes the 1000K point

-#define COLD_DAMAGE_LEVEL_1 1 //Amount of damage applied when your body temperature just passes the 260.15k safety point
-#define COLD_DAMAGE_LEVEL_2 2 //Amount of damage applied when your body temperature passes the 200K point
-#define COLD_DAMAGE_LEVEL_3 4 //Amount of damage applied when your body temperature passes the 120K point
+#define COLD_DAMAGE_LEVEL_1 0.5 //Amount of damage applied when your body temperature just passes the 260.15k safety point
+#define COLD_DAMAGE_LEVEL_2 1.5 //Amount of damage applied when your body temperature passes the 200K point
+#define COLD_DAMAGE_LEVEL_3 3 //Amount of damage applied when your body temperature passes the 120K point

 //Note that gas heat damage is only applied once every FOUR ticks.
 #define HEAT_GAS_DAMAGE_LEVEL_1 2 //Amount of damage applied when the current breath's temperature just passes the 360.15k safety point
 #define HEAT_GAS_DAMAGE_LEVEL_2 4 //Amount of damage applied when the current breath's temperature passes the 400K point
 #define HEAT_GAS_DAMAGE_LEVEL_3 8 //Amount of damage applied when the current breath's temperature passes the 1000K point

-#define COLD_GAS_DAMAGE_LEVEL_1 1 //Amount of damage applied when the current breath's temperature just passes the 260.15k safety point
-#define COLD_GAS_DAMAGE_LEVEL_2 2 //Amount of damage applied when the current breath's temperature passes the 200K point
-#define COLD_GAS_DAMAGE_LEVEL_3 4 //Amount of damage applied when the current breath's temperature passes the 120K point
+#define COLD_GAS_DAMAGE_LEVEL_1 0.5 //Amount of damage applied when the current breath's temperature just passes the 260.15k safety point
+#define COLD_GAS_DAMAGE_LEVEL_2 1.5 //Amount of damage applied when the current breath's temperature passes the 200K point
+#define COLD_GAS_DAMAGE_LEVEL_3 3 //Amount of damage applied when the current breath's temperature passes the 120K point

 /mob/living/carbon/human
 	var/oxygen_alert = 0
 	var/toxins_alert = 0
 	var/fire_alert = 0
+	var/pressure_alert = 0
 	var/prev_gender = null // Debug for plural genders
 	var/temperature_alert = 0

@@ -241,7 +242,7 @@
 			if (prob(10))
 				stuttering = max(10, stuttering)
 		if (getBrainLoss() >= 60 && stat != 2)
-			if (prob(7))
+			if (prob(3))
 				switch(pick(1,2,3))
 					if(1)
 						say(pick("IM A PONY NEEEEEEIIIIIIIIIGH", "without oxigen blob don't evoluate?", "CAPTAINS A COMDOM", "[pick("", "that faggot traitor")] [pick("joerge", "george", "gorge", "gdoruge")] [pick("mellens", "melons", "mwrlins")] is grifing me HAL;P!!!", "can u give me [pick("telikesis","halk","eppilapse")]?", "THe saiyans screwed", "Bi is THE BEST OF BOTH WORLDS>", "I WANNA PET TEH monkeyS", "stop grifing me!!!!", "SOTP IT#"))
@@ -755,12 +756,12 @@
 			//Place is colder than we are
 			var/thermal_protection = get_cold_protection(loc_temp) //This returns a 0 - 1 value, which corresponds to the percentage of protection based on what you're wearing and what you're exposed to.
 			if(thermal_protection < 1)
-				bodytemperature += (1-thermal_protection) * ((loc_temp - bodytemperature) / BODYTEMP_COLD_DIVISOR)
+				bodytemperature += min((1-thermal_protection) * ((loc_temp - bodytemperature) / BODYTEMP_COLD_DIVISOR), BODYTEMP_COOLING_MAX)
 		else
 			//Place is hotter than we are
 			var/thermal_protection = get_heat_protection(loc_temp) //This returns a 0 - 1 value, which corresponds to the percentage of protection based on what you're wearing and what you're exposed to.
 			if(thermal_protection < 1)
-				bodytemperature += (1-thermal_protection) * ((loc_temp - bodytemperature) / BODYTEMP_HEAT_DIVISOR)
+				bodytemperature += min((1-thermal_protection) * ((loc_temp - bodytemperature) / BODYTEMP_HEAT_DIVISOR), BODYTEMP_HEATING_MAX)

 		// +/- 50 degrees from 310.15K is the 'safe' zone, where no damage is dealt.
 		if(bodytemperature > 360.15)
@@ -795,10 +796,24 @@
 		// Made it possible to actually have something that can protect against high pressure... Done by Errorage. Polymorph now has an axe sticking from his head for his previous hardcoded nonsense!

 		var/pressure = environment.return_pressure()
-		if(pressure > HAZARD_HIGH_PRESSURE)
-			var/adjusted_pressure = calculate_affecting_pressure(pressure) //Returns how much pressure actually affects the mob.
-			if(adjusted_pressure > HAZARD_HIGH_PRESSURE)
-				adjustBruteLoss( min( (adjusted_pressure / HAZARD_HIGH_PRESSURE)*PRESSURE_DAMAGE_COEFFICIENT , MAX_PRESSURE_DAMAGE) )
+		var/adjusted_pressure = calculate_affecting_pressure(pressure) //Returns how much pressure actually affects the mob.
+		switch(adjusted_pressure)
+			if(HAZARD_HIGH_PRESSURE to INFINITY)
+				adjustBruteLoss( min( ( (adjusted_pressure / HAZARD_HIGH_PRESSURE) -1 )*PRESSURE_DAMAGE_COEFFICIENT , MAX_HIGH_PRESSURE_DAMAGE) )
+				pressure_alert = 2
+			if(WARNING_HIGH_PRESSURE to HAZARD_HIGH_PRESSURE)
+				pressure_alert = 1
+			if(WARNING_LOW_PRESSURE to WARNING_HIGH_PRESSURE)
+				pressure_alert = 0
+			if(HAZARD_LOW_PRESSURE to WARNING_LOW_PRESSURE)
+				pressure_alert = -1
+			else
+				if( !(COLD_RESISTANCE in mutations) )
+					adjustBruteLoss( LOW_PRESSURE_DAMAGE )
+					pressure_alert = -2
+				else
+					pressure_alert = -1
+
 		return

 	/*
@@ -1416,17 +1431,7 @@
 					else							nutrition_icon.icon_state = "nutrition4"

 			if(pressure)
-				if(istype(wear_suit, /obj/item/clothing/suit/space)||istype(wear_suit, /obj/item/clothing/suit/armor/captain))
-					pressure.icon_state = "pressure0"
-				else
-					var/datum/gas_mixture/environment = loc.return_air()
-					if(environment)
-						switch(environment.return_pressure())
-							if(HAZARD_HIGH_PRESSURE to INFINITY)				pressure.icon_state = "pressure2"
-							if(WARNING_HIGH_PRESSURE to HAZARD_HIGH_PRESSURE)	pressure.icon_state = "pressure1"
-							if(WARNING_LOW_PRESSURE to WARNING_HIGH_PRESSURE)	pressure.icon_state = "pressure0"
-							if(HAZARD_LOW_PRESSURE to WARNING_LOW_PRESSURE)		pressure.icon_state = "pressure-1"
-							else												pressure.icon_state = "pressure-2"
+				pressure.icon_state = "pressure[pressure_alert]"

 			if(pullin)
 				if(pulling)								pullin.icon_state = "pull1"
@@ -21,8 +21,7 @@
 	if(src.dna)
 		/*if(src.dna.mutantrace == "lizard") //Soghun stutterss-s-ss-sss.
 			if(copytext(message, 1, 2) != "*")
-				message = dd_replacetext(message, "s", stutter("ss"))
-*/
+				message = replacetext(message, "s", stutter("ss"))*/
 		if(src.dna.mutantrace == "metroid" && prob(5))
 			if(copytext(message, 1, 2) != "*")
 				if(copytext(message, 1, 2) == ";")
@@ -50,26 +49,30 @@

 	if(istype(src.wear_mask, /obj/item/clothing/mask/luchador))
 		if(copytext(message, 1, 2) != "*")
-			message = dd_replacetext(message, "captain", "CAPITÁN")
-			message = dd_replacetext(message, "station", "ESTACIÓN")
-			message = dd_replacetext(message, "sir", "SEÑOR")
-			message = dd_replacetext(message, "the ", "el ")
-			message = dd_replacetext(message, "my ", "mi ")
-			message = dd_replacetext(message, "is ", "es ")
-			message = dd_replacetext(message, "it's", "es")
-			message = dd_replacetext(message, "friend", "amigo")
-			message = dd_replacetext(message, "buddy", "amigo")
-			message = dd_replacetext(message, "hello", "hola")
-			message = dd_replacetext(message, " hot", " caliente")
-			message = dd_replacetext(message, " very ", " muy ")
-			message = dd_replacetext(message, "sword", "espada")
-			message = dd_replacetext(message, "library", "biblioteca")
-			message = dd_replacetext(message, "traitor", "traidor")
-			message = dd_replacetext(message, "wizard", "mago")
+			message = replacetext(message, "captain", "CAPITÁN")
+			message = replacetext(message, "station", "ESTACIÓN")
+			message = replacetext(message, "sir", "SEÑOR")
+			message = replacetext(message, "the ", "el ")
+			message = replacetext(message, "my ", "mi ")
+			message = replacetext(message, "is ", "es ")
+			message = replacetext(message, "it's", "es")
+			message = replacetext(message, "friend", "amigo")
+			message = replacetext(message, "buddy", "amigo")
+			message = replacetext(message, "hello", "hola")
+			message = replacetext(message, " hot", " caliente")
+			message = replacetext(message, " very ", " muy ")
+			message = replacetext(message, "sword", "espada")
+			message = replacetext(message, "library", "biblioteca")
+			message = replacetext(message, "traitor", "traidor")
+			message = replacetext(message, "wizard", "mago")
 			message = uppertext(message) //Things end up looking better this way (no mixed cases), and it fits the macho wrestler image.
 			if(prob(25))
 				message += " OLE!"

+	if ((HULK in mutations) && health >= 25)
+		if(copytext(message, 1, 2) != "*")
+			message = "[uppertext(message)]!!" //because I don't know how to code properly in getting vars from other files -Bro
+
 	//Ninja mask obscures text and voice if set to do so.
 	//Would make it more global but it's sort of ninja specific.
 	if(istype(src.wear_mask, /obj/item/clothing/mask/gas/voice/space_ninja)&&src.wear_mask:voice=="Unknown")
@@ -84,37 +87,37 @@
 				temp_message[H] = ninjaspeak(temp_message[H])
 				pick_list -= H
 			message = dd_list2text(temp_message, " ")
-			message = dd_replacetext(message, "o", "¤")
-			message = dd_replacetext(message, "p", "þ")
-			message = dd_replacetext(message, "l", "£")
-			message = dd_replacetext(message, "s", "§")
-			message = dd_replacetext(message, "u", "µ")
-			message = dd_replacetext(message, "b", "ß")
+			message = replacetext(message, "o", "¤")
+			message = replacetext(message, "p", "þ")
+			message = replacetext(message, "l", "£")
+			message = replacetext(message, "s", "§")
+			message = replacetext(message, "u", "µ")
+			message = replacetext(message, "b", "ß")
 			/*This text is hilarious but also absolutely retarded.
-			message = dd_replacetext(message, "l", "r")
-			message = dd_replacetext(message, "rr", "ru")
-			message = dd_replacetext(message, "v", "b")
-			message = dd_replacetext(message, "f", "hu")
-			message = dd_replacetext(message, "'t", "")
-			message = dd_replacetext(message, "t ", "to ")
-			message = dd_replacetext(message, " I ", " ai ")
-			message = dd_replacetext(message, "th", "z")
-			message = dd_replacetext(message, "ish", "isu")
-			message = dd_replacetext(message, "is", "izu")
-			message = dd_replacetext(message, "ziz", "zis")
-			message = dd_replacetext(message, "se", "su")
-			message = dd_replacetext(message, "br", "bur")
-			message = dd_replacetext(message, "ry", "ri")
-			message = dd_replacetext(message, "you", "yuu")
-			message = dd_replacetext(message, "ck", "cku")
-			message = dd_replacetext(message, "eu", "uu")
-			message = dd_replacetext(message, "ow", "au")
-			message = dd_replacetext(message, "are", "aa")
-			message = dd_replacetext(message, "ay", "ayu")
-			message = dd_replacetext(message, "ea", "ii")
-			message = dd_replacetext(message, "ch", "chi")
-			message = dd_replacetext(message, "than", "sen")
-			message = dd_replacetext(message, ".", "")
+			message = replacetext(message, "l", "r")
+			message = replacetext(message, "rr", "ru")
+			message = replacetext(message, "v", "b")
+			message = replacetext(message, "f", "hu")
+			message = replacetext(message, "'t", "")
+			message = replacetext(message, "t ", "to ")
+			message = replacetext(message, " I ", " ai ")
+			message = replacetext(message, "th", "z")
+			message = replacetext(message, "ish", "isu")
+			message = replacetext(message, "is", "izu")
+			message = replacetext(message, "ziz", "zis")
+			message = replacetext(message, "se", "su")
+			message = replacetext(message, "br", "bur")
+			message = replacetext(message, "ry", "ri")
+			message = replacetext(message, "you", "yuu")
+			message = replacetext(message, "ck", "cku")
+			message = replacetext(message, "eu", "uu")
+			message = replacetext(message, "ow", "au")
+			message = replacetext(message, "are", "aa")
+			message = replacetext(message, "ay", "ayu")
+			message = replacetext(message, "ea", "ii")
+			message = replacetext(message, "ch", "chi")
+			message = replacetext(message, "than", "sen")
+			message = replacetext(message, ".", "")
 			message = lowertext(message)
 			*/
 	if (src.slurring)
@@ -674,6 +674,11 @@ proc/get_damage_icon_part(damage_state, body_part)
 			lying.overlays		+= image("icon" = 'icons/effects/blood.dmi', "icon_state" = "[t_state]blood2")
 			standing.overlays	+= image("icon" = 'icons/effects/blood.dmi', "icon_state" = "[t_state]blood")

+			if(wear_suit.blood_DNA)
+				var/obj/item/clothing/suit/S = wear_suit
+				lying.overlays		+= image("icon" = 'icons/effects/blood.dmi', "icon_state" = "[S.blood_overlay_type]blood2")
+				standing.overlays	+= image("icon" = 'icons/effects/blood.dmi', "icon_state" = "[S.blood_overlay_type]blood")
+
 		overlays_lying[SUIT_LAYER]		= lying
 		overlays_standing[SUIT_LAYER]	= standing

@@ -48,12 +48,12 @@
 				temp_message[H] = ninjaspeak(temp_message[H])
 				pick_list -= H
 			message = dd_list2text(temp_message, " ")
-			message = dd_replacetext(message, "o", "¤")
-			message = dd_replacetext(message, "p", "þ")
-			message = dd_replacetext(message, "l", "£")
-			message = dd_replacetext(message, "s", "§")
-			message = dd_replacetext(message, "u", "µ")
-			message = dd_replacetext(message, "b", "ß")
+			message = replacetext(message, "o", "¤")
+			message = replacetext(message, "p", "þ")
+			message = replacetext(message, "l", "£")
+			message = replacetext(message, "s", "§")
+			message = replacetext(message, "u", "µ")
+			message = replacetext(message, "b", "ß")

 	if (src.stuttering)
 		message = stutter(message)
@@ -6,6 +6,9 @@
 		//param = copytext(act, t1 + 1, length(act) + 1)
 		act = copytext(act, 1, t1)

+	if(findtext(act,"s",-1) && !findtext(act,"_",-2))//Removes ending s's unless they are prefixed with a '_'
+		act = copytext(act,1,length(act))
+
 	var/m_type = 1
 	var/message

@@ -155,7 +155,7 @@

 /mob/living/carbon/metroid/proc/handle_environment(datum/gas_mixture/environment)
 	if(!environment)
-		adjustFireLoss(rand(10,20))
+		adjustToxLoss(rand(10,20))
 		return

 	//var/environment_heat_capacity = environment.heat_capacity()
@@ -199,9 +199,9 @@

 		if(bodytemperature <= (T0C - 50)) // hurt temperature
 			if(bodytemperature <= 50) // sqrting negative numbers is bad
-				adjustFireLoss(200)
+				adjustToxLoss(200)
 			else
-				adjustFireLoss(round(sqrt(bodytemperature)) * 2)
+				adjustToxLoss(round(sqrt(bodytemperature)) * 2)

 	else
 		Tempstun = 0
@@ -5,6 +5,10 @@
 		var/t1 = findtext(act, "-", 1, null)
 		param = copytext(act, t1 + 1, length(act) + 1)
 		act = copytext(act, 1, t1)
+
+	if(findtext(act,"s",-1) && !findtext(act,"_",-2))//Removes ending s's unless they are prefixed with a '_'
+		act = copytext(act,1,length(act))
+
 	var/muzzled = istype(src.wear_mask, /obj/item/clothing/mask/muzzle)
 	var/m_type = 1
 	var/message
@@ -4,6 +4,7 @@
 	var/oxygen_alert = 0
 	var/toxins_alert = 0
 	var/fire_alert = 0
+	var/pressure_alert = 0

 	var/temperature_alert = 0

@@ -335,13 +336,27 @@
 			bodytemperature += 0.1*(environment.temperature - bodytemperature)*environment_heat_capacity/(environment_heat_capacity + 270000)

 		//Account for massive pressure differences
-		var/pressure = environment.return_pressure()
-		if(pressure > HAZARD_HIGH_PRESSURE)
-			var/adjusted_pressure = calculate_affecting_pressure(pressure) //Returns how much pressure actually affects the mob.
-			if(adjusted_pressure > HAZARD_HIGH_PRESSURE)
-				adjustBruteLoss( min( (adjusted_pressure / HAZARD_HIGH_PRESSURE)*PRESSURE_DAMAGE_COEFFICIENT , MAX_PRESSURE_DAMAGE) )

-		return //TODO: DEFERRED
+		var/pressure = environment.return_pressure()
+		var/adjusted_pressure = calculate_affecting_pressure(pressure) //Returns how much pressure actually affects the mob.
+		switch(adjusted_pressure)
+			if(HAZARD_HIGH_PRESSURE to INFINITY)
+				adjustBruteLoss( min( ( (adjusted_pressure / HAZARD_HIGH_PRESSURE) -1 )*PRESSURE_DAMAGE_COEFFICIENT , MAX_HIGH_PRESSURE_DAMAGE) )
+				pressure_alert = 2
+			if(WARNING_HIGH_PRESSURE to HAZARD_HIGH_PRESSURE)
+				pressure_alert = 1
+			if(WARNING_LOW_PRESSURE to WARNING_HIGH_PRESSURE)
+				pressure_alert = 0
+			if(HAZARD_LOW_PRESSURE to WARNING_LOW_PRESSURE)
+				pressure_alert = -1
+			else
+				if( !(COLD_RESISTANCE in mutations) )
+					adjustBruteLoss( LOW_PRESSURE_DAMAGE )
+					pressure_alert = -2
+				else
+					pressure_alert = -1
+
+		return

 	proc/handle_temperature_damage(body_part, exposed_temperature, exposed_intensity)
 		if(nodamage) return
@@ -484,21 +499,9 @@
 			else
 				healths.icon_state = "health7"

-		if (pressure)
-			var/datum/gas_mixture/environment = loc.return_air()
-			if(environment)
-				switch(environment.return_pressure())

-					if(HAZARD_HIGH_PRESSURE to INFINITY)
-						pressure.icon_state = "pressure2"
-					if(WARNING_HIGH_PRESSURE to HAZARD_HIGH_PRESSURE)
-						pressure.icon_state = "pressure1"
-					if(WARNING_LOW_PRESSURE to WARNING_HIGH_PRESSURE)
-						pressure.icon_state = "pressure0"
-					if(HAZARD_LOW_PRESSURE to WARNING_LOW_PRESSURE)
-						pressure.icon_state = "pressure-1"
-					else
-						pressure.icon_state = "pressure-2"
+		if(pressure)
+			pressure.icon_state = "pressure[pressure_alert]"

 		if(pullin)	pullin.icon_state = "pull[pulling ? 1 : 0]"

@@ -262,6 +262,8 @@
 /mob/living/proc/revive()
 	setToxLoss(0)
 	setOxyLoss(0)
+	setCloneLoss(0)
+	setBrainLoss(0)
 	SetParalysis(0)
 	SetStunned(0)
 	SetWeakened(0)
@@ -278,6 +280,8 @@
 	heal_overall_damage(1000, 1000)
 	buckled = initial(src.buckled)
 	handcuffed = initial(src.handcuffed)
+	for(var/datum/disease/D in viruses)
+		D.cure(0)
 	if(stat == 2)
 		dead_mob_list -= src
 		living_mob_list += src
@@ -75,11 +75,9 @@
 			apply_damage(O.throwforce, dtype, zone, armor, O)
 		if(!O.fingerprintslast)
 			return
-		var/mob/assailant = null
-		for(var/mob/living/M in player_list)//Finds the name of whoever threw it (This is required unless thrown objects are COMPLETELY reworked
-			if(M.key == O.fingerprintslast)
-				assailant = M
-				continue
-		src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been hit with [O], last touched by [assailant.name] ([assailant.ckey])</font>")
-		assailant.attack_log += text("\[[time_stamp()]\] <font color='red'>Hit [src.name] ([src.ckey]) with [O]</font>")
-		log_attack("<font color='red'>[src.name] ([src.ckey]) was hit by [O], last touched by [assailant.name] ([assailant.ckey])</font>")
+		var/client/assailant = directory[ckey(O.fingerprintslast)]
+		if(assailant.mob && istype(assailant.mob,/mob))
+			var/mob/M = assailant.mob
+			src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been hit with [O], last touched by [M.name] ([assailant.ckey])</font>")
+			M.attack_log += text("\[[time_stamp()]\] <font color='red'>Hit [src.name] ([src.ckey]) with [O]</font>")
+			log_attack("<font color='red'>[src.name] ([src.ckey]) was hit by [O], last touched by [M.name] ([assailant.ckey])</font>")
@@ -165,15 +165,15 @@ var/list/department_radio_keys = list(

 	// :downs:
 	if (getBrainLoss() >= 60)
-		message = dd_replacetext(message, " am ", " ")
-		message = dd_replacetext(message, " is ", " ")
-		message = dd_replacetext(message, " are ", " ")
-		message = dd_replacetext(message, "you", "u")
-		message = dd_replacetext(message, "help", "halp")
-		message = dd_replacetext(message, "grief", "grife")
-		message = dd_replacetext(message, "space", "spess")
-		message = dd_replacetext(message, "carp", "crap")
-		message = dd_replacetext(message, "reason", "raisin")
+		message = replacetext(message, " am ", " ")
+		message = replacetext(message, " is ", " ")
+		message = replacetext(message, " are ", " ")
+		message = replacetext(message, "you", "u")
+		message = replacetext(message, "help", "halp")
+		message = replacetext(message, "grief", "grife")
+		message = replacetext(message, "space", "spess")
+		message = replacetext(message, "carp", "crap")
+		message = replacetext(message, "reason", "raisin")
 		if(prob(50))
 			message = uppertext(message)
 			message += "[stutter(pick("!", "!!", "!!!"))]"
@@ -16,7 +16,7 @@ var/datum/cameranet/cameranet = new()
 	x &= ~0xf
 	y &= ~0xf
 	var/key = "[x],[y],[z]"
-	return key in chunks
+	return (chunks[key])

 // Returns the chunk in the x, y, z.
 // If there is no chunk, it creates a new chunk and returns that.
@@ -24,7 +24,7 @@ var/datum/cameranet/cameranet = new()
 	x &= ~0xf
 	y &= ~0xf
 	var/key = "[x],[y],[z]"
-	if(!(key in chunks))
+	if(!chunks[key])
 		chunks[key] = new /datum/camerachunk(null, x, y, z)

 	return chunks[key]
@@ -130,6 +130,6 @@ var/datum/cameranet/cameranet = new()
 	if(chunk)
 		if(chunk.changed)
 			chunk.hasChanged(1) // Update now, no matter if it's visible or not.
-		if(position in chunk.visibleTurfs)
+		if(chunk.visibleTurfs[position])
 			return 1
 	return 0
@@ -47,7 +47,7 @@
 // Called when a chunk has changed. I.E: A wall was deleted.

 /datum/camerachunk/proc/visibilityChanged(turf/loc)
-	if(!(loc in visibleTurfs))
+	if(!visibleTurfs[loc])
 		return
 	hasChanged()

@@ -86,7 +86,7 @@
 			continue

 		for(var/turf/t in c.can_see())
-			newVisibleTurfs += t
+			newVisibleTurfs[t] = t

 	// Removes turf that isn't in turfs.
 	newVisibleTurfs &= turfs
@@ -110,7 +110,7 @@

 	for(var/turf in visRemoved)
 		var/turf/t = turf
-		if(t in obscuredTurfs)
+		if(obscuredTurfs[t])
 			if(!t.obscured)
 				t.obscured = image('icons/effects/cameravis.dmi', t, "black", 15)

@@ -141,7 +141,7 @@

 	for(var/turf/t in range(10, locate(x + 8, y + 8, z)))
 		if(t.x >= x && t.y >= y && t.x < x + 16 && t.y < y + 16)
-			turfs += t
+			turfs[t] = t

 	for(var/camera in cameras)
 		var/obj/machinery/camera/c = camera
@@ -152,7 +152,7 @@
 			continue

 		for(var/turf/t in c.can_see())
-			visibleTurfs += t
+			visibleTurfs[t] = t

 	// Removes turf that isn't in turfs.
 	visibleTurfs &= turfs
@@ -461,7 +461,7 @@
 		else
 			dat += "<pre>Requested security record not found,</pre><BR>"
 		if ((istype(src.securityActive2, /datum/data/record) && data_core.security.Find(src.securityActive2)))
-			dat += text("<BR>\nSecurity Data<BR>\nCriminal Status: <A href='?src=\ref[];field=criminal'>[]</A><BR>\n<BR>\nMinor Crimes: <A href='?src=\ref[];field=mi_crim'>[]</A><BR>\nDetails: <A href='?src=\ref[];field=mi_crim_d'>[]</A><BR>\n<BR>\nMajor Crimes: <A href='?src=\ref[];field=ma_crim'>[]</A><BR>\nDetails: <A href='?src=\ref[];field=ma_crim_d'>[]</A><BR>\n<BR>\nImportant Notes:<BR>\n\t<A href='?src=\ref[];field=notes'>[]</A><BR>\n<BR>\n<CENTER><B>Comments/Log</B></CENTER><BR>", src, src.securityActive2.fields["criminal"], src, src.securityActive2.fields["mi_crim"], src, src.securityActive2.fields["mi_crim_d"], src, src.securityActive2.fields["ma_crim"], src, src.securityActive2.fields["ma_crim_d"], src, src.securityActive2.fields["notes"])
+			dat += text("<BR>\nSecurity Data<BR>\nCriminal Status: []<BR>\n<BR>\nMinor Crimes: <A href='?src=\ref[];field=mi_crim'>[]</A><BR>\nDetails: <A href='?src=\ref[];field=mi_crim_d'>[]</A><BR>\n<BR>\nMajor Crimes: <A href='?src=\ref[];field=ma_crim'>[]</A><BR>\nDetails: <A href='?src=\ref[];field=ma_crim_d'>[]</A><BR>\n<BR>\nImportant Notes:<BR>\n\t<A href='?src=\ref[];field=notes'>[]</A><BR>\n<BR>\n<CENTER><B>Comments/Log</B></CENTER><BR>", src.securityActive2.fields["criminal"], src, src.securityActive2.fields["mi_crim"], src, src.securityActive2.fields["mi_crim_d"], src, src.securityActive2.fields["ma_crim"], src, src.securityActive2.fields["ma_crim_d"], src, src.securityActive2.fields["notes"])
 		else
 			dat += "<pre>Requested security record not found,</pre><BR>"
 		dat += text("<BR>\n<A href='?src=\ref[];software=securityrecord;sub=0'>Back</A><BR>", src)
@@ -5,6 +5,9 @@
 		param = copytext(act, t1 + 1, length(act) + 1)
 		act = copytext(act, 1, t1)

+	if(findtext(act,"s",-1) && !findtext(act,"_",-2))//Removes ending s's unless they are prefixed with a '_'
+		act = copytext(act,1,length(act))
+
 	switch(act)
 		if ("salute")
 			if (!src.buckled)
@@ -143,6 +146,7 @@
 			else
 				message = "<B>[src]</B> looks."
 			m_type = 1
+
 		if("beep")
 			var/M = null
 			if(param)
@@ -157,8 +161,8 @@
 				message = "<B>[src]</B> beeps at [param]."
 			else
 				message = "<B>[src]</B> beeps."
-			playsound(src.loc, 'twobeep.ogg', 50, 0)
-			m_type = 2
+			playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 0)
+			m_type = 1

 		if("ping")
 			var/M = null
@@ -174,8 +178,8 @@
 				message = "<B>[src]</B> pings at [param]."
 			else
 				message = "<B>[src]</B> pings."
-			playsound(src.loc, 'ping.ogg', 50, 0)
-			m_type = 2
+			playsound(src.loc, 'sound/machines/ping.ogg', 50, 0)
+			m_type = 1

 		if("buzz")
 			var/M = null
@@ -191,8 +195,8 @@
 				message = "<B>[src]</B> buzzes at [param]."
 			else
 				message = "<B>[src]</B> buzzes."
-			playsound(src.loc, 'buzz-sigh.ogg', 50, 0)
-			m_type = 2
+			playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
+			m_type = 1

 		if("law")
 			if (istype(module,/obj/item/weapon/robot_module/security))
@@ -145,11 +145,11 @@
 		src.sight |= SEE_TURFS
 		src.sight |= SEE_MOBS
 		src.see_in_dark = 8
-		src.see_invisible = SEE_INVISIBLE_MINIMUM
+		see_invisible = SEE_INVISIBLE_MINIMUM
 	else if (src.sight_mode & BORGMESON)
 		src.sight |= SEE_TURFS
 		src.see_in_dark = 8
-		src.see_invisible = SEE_INVISIBLE_MINIMUM
+		see_invisible = SEE_INVISIBLE_MINIMUM
 	else if (src.sight_mode & BORGTHERM)
 		src.sight |= SEE_MOBS
 		src.see_in_dark = 8
@@ -970,7 +970,7 @@
 		s_active.close(src)

 	if(module)
-		if(module.type == /obj/item/weapon/robot_module/janitor)	//you'd think checking the module would work
+		if(module.type == /obj/item/weapon/robot_module/janitor)
 			var/turf/tile = loc
 			if(isturf(tile))
 				tile.clean_blood()
@@ -406,4 +406,59 @@
 	if(href_list["remove_inv"] || href_list["add_inv"])
 		usr << "\red You can't fit this on [src]"
 		return
-	..()
+	..()
+
+
+//LISA! SQUEEEEEEEEE~
+/mob/living/simple_animal/corgi/Lisa
+	name = "Lisa"
+	real_name = "Lisa"
+	gender = FEMALE
+	desc = "It's a corgi with a cute pink bow."
+	icon_state = "lisa"
+	icon_living = "lisa"
+	icon_dead = "lisa_dead"
+	response_help  = "pets"
+	response_disarm = "bops"
+	response_harm   = "kicks"
+	var/turns_since_scan = 0
+	var/puppies = 0
+
+//Lisa already has a cute bow!
+/mob/living/simple_animal/corgi/Lisa/Topic(href, href_list)
+	if(href_list["remove_inv"] || href_list["add_inv"])
+		usr << "\red [src] already has a cute bow!"
+		return
+	..()
+
+/mob/living/simple_animal/corgi/Lisa/Life()
+	..()
+
+	if(!stat && !resting && !buckled)
+		turns_since_scan++
+		if(turns_since_scan > 15)
+			turns_since_scan = 0
+			var/alone = 1
+			var/ian = 0
+			for(var/mob/M in oviewers(7, src))
+				if(istype(M, /mob/living/simple_animal/corgi/Ian))
+					if(M.client)
+						alone = 0
+						break
+					else
+						ian = M
+				else
+					alone = 0
+					break
+			if(alone && ian && puppies < 4)
+				if(near_camera(src) || near_camera(ian))
+					return
+				new /mob/living/simple_animal/corgi/puppy(loc)
+
+
+		if(prob(1))
+			emote(pick("dances around","chases her tail"))
+			spawn(0)
+				for(var/i in list(1,2,4,8,4,2,1,2,4,8,4,2,1,2,4,8,4,2))
+					dir = i
+					sleep(1)
@@ -33,7 +33,7 @@
 	min_n2 = 0
 	max_n2 = 0
 	minbodytemp = 0
-
+	var/stance_step = 0
 //SPACE BEARS! SQUEEEEEEEE~     OW! FUCK! IT BIT MY HAND OFF!!
 /mob/living/simple_animal/hostile/bear/Hudson
 	name = "Hudson"
@@ -1,7 +1,6 @@
 /mob/living/simple_animal/hostile

 	var/stance = HOSTILE_STANCE_IDLE	//Used to determine behavior
-	var/stance_step = 0				//Used to delay checks depending on what stance the hostile
 	var/mob/living/target_mob		//Once the bear enters attack stance, it will try to chase this mob. This it to prevent it changing it's mind between multiple mobs.
 	var/attack_same = 0

@@ -9,42 +8,36 @@

 	var/atom/T = null
 	stop_automated_movement = 0
-	stance_step++
-	if(stance_step > 5)
-		stance_step = 0
-		for(var/atom/A in ListTargets())
+	for(var/atom/A in ListTargets())

-			if(!attack_same && istype(A, src.type))
-				continue
+		if(!attack_same && istype(A, src.type))
+			continue

-			if(isliving(A))
-				var/mob/living/L = A
-				if(!L.stat)
-					stance = HOSTILE_STANCE_ATTACK
-					T = L
-					break
-			if(istype(A, /obj/mecha))
-				var/obj/mecha/M = A
-				if (M.occupant)
-					stance = HOSTILE_STANCE_ATTACK
-					T = M
-					break
-		return T
+		if(isliving(A))
+			var/mob/living/L = A
+			if(!L.stat)
+				stance = HOSTILE_STANCE_ATTACK
+				T = L
+				break
+		if(istype(A, /obj/mecha))
+			var/obj/mecha/M = A
+			if (M.occupant)
+				stance = HOSTILE_STANCE_ATTACK
+				T = M
+				break
+	return T

 /mob/living/simple_animal/hostile/proc/MoveToTarget(var/step = 5)
 	stop_automated_movement = 1
 	if(!target_mob || SA_attackable(target_mob))
 		stance = HOSTILE_STANCE_IDLE
-		stance_step = step //Make it very alert, so it quickly attacks again if a mob returns
 	if(target_mob in ListTargets())
-		walk_to(src, target_mob, 1, 3)
+		walk_to(src, target_mob, 1, 2)
 		stance = HOSTILE_STANCE_ATTACKING
-		stance_step = 0

 /mob/living/simple_animal/hostile/proc/AttackTarget()

 	stop_automated_movement = 1
-	stance_step++
 	if(!target_mob || SA_attackable(target_mob))
 		LoseTarget()
 		return
@@ -64,20 +57,18 @@
 		M.attack_animal(src)
 		return M

-/mob/living/simple_animal/hostile/proc/LoseTarget(var/step = 3)
+/mob/living/simple_animal/hostile/proc/LoseTarget()
 	stance = HOSTILE_STANCE_IDLE
-	stance_step = step
 	target_mob = null
 	walk(src, 0)

-/mob/living/simple_animal/hostile/proc/LostTarget(var/step = 1)
+/mob/living/simple_animal/hostile/proc/LostTarget()
 	stance = HOSTILE_STANCE_IDLE
-	stance_step = step
 	walk(src, 0)


 /mob/living/simple_animal/hostile/proc/ListTargets()
-	return view(src, 7)
+	return view(src, 10)

 /mob/living/simple_animal/hostile/Die()
 	..()
@@ -39,7 +39,7 @@
 	emote_hear = list("squawks","bawks")
 	emote_see = list("flutters its wings")

-	speak_chance = 8//4% (1 in 25) chance every tick
+	speak_chance = 1//1% (1 in 100) chance every tick; So about once per 150 seconds, assuming an average tick is 1.5s
 	turns_per_move = 5
 	meat_type = /obj/item/weapon/reagent_containers/food/snacks/cracker/

@@ -104,6 +104,7 @@
 	if(held_item)
 		held_item.loc = src.loc
 		held_item = null
+	walk(src,0)
 	..()

 /*
@@ -307,7 +308,6 @@
 		clearlist(speech_buffer)


-
 //-----SLEEPING
 	if(parrot_state == PARROT_PERCH)
 		if(parrot_perch.loc != src.loc) //Make sure someone hasnt moved our perch on us
@@ -512,7 +512,7 @@
 */

 /mob/living/simple_animal/parrot/movement_delay()
-	if(client && parrot_state != "parrot_fly")
+	if(client && stat == CONSCIOUS && parrot_state != "parrot_fly")
 		icon_state = "parrot_fly"
 	..()

@@ -529,7 +529,7 @@

 		if(iscarbon(AM))
 			var/mob/living/carbon/C = AM
-			if(C.l_hand.w_class <= 2 || C.r_hand.w_class <= 2)
+			if((C.l_hand && C.l_hand.w_class <= 2) || (C.r_hand && C.r_hand.w_class <= 2))
 				return C
 	return null

@@ -558,7 +558,7 @@

 		if(iscarbon(AM))
 			var/mob/living/carbon/C = AM
-			if(C.l_hand.w_class <= 2 || C.r_hand.w_class <= 2)
+			if(C.l_hand && C.l_hand.w_class <= 2 || C.r_hand && C.r_hand.w_class <= 2)
 				return C
 	return null

@@ -609,10 +609,10 @@
 	var/obj/item/stolen_item = null

 	for(var/mob/living/carbon/C in view(1,src))
-		if(C.l_hand.w_class <= 2)
+		if(C.l_hand && C.l_hand.w_class <= 2)
 			stolen_item = C.l_hand

-		if(C.r_hand.w_class <= 2)
+		if(C.r_hand && C.r_hand.w_class <= 2)
 			stolen_item = C.r_hand

 		if(stolen_item)
@@ -101,7 +101,7 @@
 				stop_automated_movement = 1
 				if(!target_mob || SA_attackable(target_mob))
 					stance = SYNDICATE_STANCE_IDLE
-				if(target_mob in view(7, src))
+				if(target_mob in view(10, src))
 					if(ranged)
 						if(get_dist(src, target_mob) <= 6)
 							OpenFire(target_mob)
@@ -117,7 +117,7 @@
 					stance = SYNDICATE_STANCE_IDLE
 					target_mob = null
 					return
-				if(!(target_mob in view(7, src)))
+				if(!(target_mob in view(10, src)))
 					stance = SYNDICATE_STANCE_IDLE
 					target_mob = null
 					return
@@ -187,7 +187,7 @@

 /mob/living/simple_animal/syndicate/melee/attackby(var/obj/item/O as obj, var/mob/user as mob)
 	if(O.force)
-		if(prob(80))
+		if(prob(65))
 			var/damage = O.force
 			if (O.damtype == HALLOSS)
 				damage = 0
@@ -137,7 +137,7 @@
 		if(istype(target,/turf/simulated/wall))
 			if((!istype(target,/turf/simulated/wall/r_wall) && eatingDuration >= 100) || eatingDuration >= 200) //need 20 ticks to eat an rwall, 10 for a regular one
 				var/turf/simulated/wall/wall = target
-				wall.ReplaceWithFloor()
+				wall.ChangeTurf(/turf/simulated/floor)
 				new /obj/item/stack/sheet/metal(src, flatPlasmaValue)
 				return 1
 		else if(istype(target,/atom/movable))
@@ -1,9 +1,5 @@
 //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
@@ -37,11 +33,6 @@
 	if(hud_used)	del(hud_used)		//remove the hud objects
 	hud_used = new /datum/hud(src)

-	if(!dna)
-		dna = new /datum/dna(null)
-		if(dna)
-			dna.real_name = real_name
-
 	next_move = 1
 	sight |= SEE_SELF
 	..()
@@ -352,7 +352,7 @@ var/list/slot_equipment_priority = list( \

 /mob/proc/print_flavor_text()
 	if (flavor_text && flavor_text != "")
-		var/msg = dd_replacetext(flavor_text, "\n", " ")
+		var/msg = replacetext(flavor_text, "\n", " ")
 		if(lentext(msg) <= 40)
 			return "\blue [msg]"
 		else
@@ -474,20 +474,20 @@ var/list/slot_equipment_priority = list( \
 	set category = "OOC"
 	var/is_admin = 0

-	if (client.holder && client.holder.level >= 1 && ( client.holder.state == 2 || client.holder.level > 3 ))
+	if(client.holder && (client.holder.rights & R_ADMIN))
 		is_admin = 1
-	else if (istype(src, /mob/new_player) || stat != 2)
+	else if(stat != DEAD || istype(src, /mob/new_player))
 		usr << "\blue You must be observing to use this!"
 		return

-	if (is_admin && stat == 2)
+	if(is_admin && stat == DEAD)
 		is_admin = 0

 	var/list/names = list()
 	var/list/namecounts = list()
 	var/list/creatures = list()

-	for(var/obj/O in world)
+	for(var/obj/O in world)				//EWWWWWWWWWWWWWWWWWWWWWWWW ~needs to be optimised
 		if(!O.loc)
 			continue
 		if(istype(O, /obj/item/weapon/disk/nuclear))
@@ -568,7 +568,7 @@ var/list/slot_equipment_priority = list( \
 		src << browse(null, t1)

 	if(href_list["flavor_more"])
-		usr << browse(text("<HTML><HEAD><TITLE>[]</TITLE></HEAD><BODY><TT>[]</TT></BODY></HTML>", name, dd_replacetext(flavor_text, "\n", "<BR>")), text("window=[];size=500x200", name))
+		usr << browse(text("<HTML><HEAD><TITLE>[]</TITLE></HEAD><BODY><TT>[]</TT></BODY></HTML>", name, replacetext(flavor_text, "\n", "<BR>")), text("window=[];size=500x200", name))
 		onclose(usr, "[name]")
 	if(href_list["flavor_change"])
 		update_flavor_text()
@@ -3,25 +3,32 @@
 Put (mob/proc)s here that are in dire need of a code cleanup.
 */

-/mob/living/proc/has_disease(var/datum/disease/virus)
+/mob/proc/has_disease(var/datum/disease/virus)
 	for(var/datum/disease/D in viruses)
-		if(istype(D, virus))
+		if(D.IsSame(virus))
+			//error("[D.name]/[D.type] is the same as [virus.name]/[virus.type]")
 			return 1
 	return 0

 // This proc has some procs that should be extracted from it. I believe we can develop some helper procs from it - Rockdtben
-/mob/proc/contract_disease(var/datum/disease/virus, var/skip_this = 0, var/force_species_check=1)
-//	world << "Contract_disease called by [src] with virus [virus]"
-	if(stat >=2 || src.resistances.Find(virus.type)) return
+/mob/proc/contract_disease(var/datum/disease/virus, var/skip_this = 0, var/force_species_check=1, var/spread_type = -5)
+	//world << "Contract_disease called by [src] with virus [virus]"
+	if(stat >=2)
+		//world << "He's dead jim."
+		return
+	if(istype(virus, /datum/disease/advance))
+		//world << "It's an advance virus."
+		var/datum/disease/advance/A = virus
+		if(A.GetDiseaseID() in resistances)
+			//world << "It resisted us!"
+			return
+	else
+		if(src.resistances.Find(virus.type))
+			//world << "Normal virus and resisted"
+			return

-//This gives a chance to re-infect cured/vaccinated mobs
-//	if(virus.type in resistances)
-//		if(prob(99.9)) return
-//		resistances.Remove(virus.type)//the resistance is futile
-
-	for(var/datum/disease/D in viruses)
-		if(istype(D, virus.type))
-			return // two viruses of the same kind can't infect a body at once!!
+	if(has_disease(virus))
+		return


 	if(force_species_check)
@@ -34,10 +41,10 @@ Put (mob/proc)s here that are in dire need of a code cleanup.
 		if(fail) return

 	if(skip_this == 1)
+		//world << "infectin"
 		//if(src.virus)				< -- this used to replace the current disease. Not anymore!
 			//src.virus.cure(0)
-
-		var/datum/disease/v = new virus.type
+		var/datum/disease/v = new virus.type(1, virus, 0)
 		src.viruses += v
 		v.affected_mob = src
 		v.strain_data = v.strain_data.Copy()
@@ -45,7 +52,7 @@ Put (mob/proc)s here that are in dire need of a code cleanup.
 		if(v.can_carry && prob(5))
 			v.carrier = 1
 		return
-
+	//world << "Not skipping."
 	//if(src.virus) //
 		//return //

@@ -64,7 +71,7 @@ Put (mob/proc)s here that are in dire need of a code cleanup.

 */
 	if(prob(15/virus.permeability_mod)) return //the power of immunity compels this disease! but then you forgot resistances
-
+	//world << "past prob()"
 	var/obj/item/clothing/Cl = null
 	var/passed = 1

@@ -74,7 +81,10 @@ Put (mob/proc)s here that are in dire need of a code cleanup.
 	var/hands_ch
 	var/feet_ch

-	switch(virus.spread_type)
+	if(spread_type == -5)
+		spread_type = virus.spread_type
+
+	switch(spread_type)
 		if(CONTACT_HANDS)
 			head_ch = 0
 			body_ch = 0
@@ -155,7 +165,7 @@ Put (mob/proc)s here that are in dire need of a code cleanup.
 					passed = prob(Cl.permeability_coefficient*100+virus.permeability_mod)
 					//world << "Mask pass [passed]"

-	if(passed && virus.spread_type == AIRBORNE && internals)
+	if(passed && spread_type == AIRBORNE && internals)
 		passed = (prob(50*virus.permeability_mod))

 	if(passed)
@@ -189,7 +199,8 @@ Put (mob/proc)s here that are in dire need of a code cleanup.
 	else if(prob(15))
 		return
 	else*/
-		var/datum/disease/v = new virus.type
+
+		var/datum/disease/v = new virus.type(1, virus, 0)
 		src.viruses += v
 		v.affected_mob = src
 		v.strain_data = v.strain_data.Copy()
@@ -107,17 +107,16 @@
 			affecting.loc = assailant.loc
 	if ((killing == 2 && state == 3))
 		if(assailant.loc != kill_loc)
-			for(var/mob/O in viewers(assailant, null))
-				O.show_message(text("\red [] lost \his tightened grip on []'s neck!", assailant, affecting), 1)
+			visible_message("\red [assailant] lost \his tightened grip on [affecting]'s neck!")
 			killing = 0
 			hud1.icon_state = "disarm/kill"
 			return
-            
+
 		if(ishuman(affecting))
 			var/mob/living/carbon/human/H = affecting
 			var/datum/organ/external/head = H.get_organ("head")
 			head.add_autopsy_data("Strangulation", 0)
-            
+
 		affecting.Weaken(5) // Should keep you down unless you get help.
 		affecting.Stun(5) // It will hamper your voice, being choked and all.
 		affecting.losebreath = min(affecting.losebreath + 2, 3)
@@ -139,8 +138,7 @@
 		if(1.0)
 			if (state >= 3)
 				if (!( killing ))
-					for(var/mob/O in viewers(assailant, null))
-						O.show_message(text("\red [] has temporarily tightened \his grip on []!", assailant, affecting), 1)
+					visible_message("\red [assailant] has temporarily tightened \his grip on [affecting]!")
 						//Foreach goto(97)
 					assailant.next_move = world.time + 10
 					//affecting.stunned = max(2, affecting.stunned)
@@ -169,7 +167,10 @@
 			if (state < 2)
 				if (!( allow_upgrade ))
 					return
-				if (prob(75))
+				visible_message("\red [assailant] has grabbed [affecting] aggressively (now hands)!")
+				state = 2
+				icon_state = "grabbed1"
+				/*if (prob(75))
 					for(var/mob/O in viewers(assailant, null))
 						O.show_message(text("\red [] has grabbed [] aggressively (now hands)!", assailant, affecting), 1)
 					state = 2
@@ -178,7 +179,7 @@
 					for(var/mob/O in viewers(assailant, null))
 						O.show_message(text("\red [] has failed to grab [] aggressively!", assailant, affecting), 1)
 					del(src)
-					return
+					return*/
 			else
 				if (state < 3)
 					if(istype(affecting, /mob/living/carbon/human))
@@ -203,9 +204,7 @@
 						assailant << "\blue You squeeze [affecting], but nothing interesting happens."
 						return

-					for(var/mob/O in viewers(assailant, null))
-						O.show_message(text("\red [] has reinforced \his grip on [] (now neck)!", assailant, affecting), 1)
-
+					visible_message("\red [assailant] has reinforced \his grip on [affecting] (now neck)!")
 					state = 3
 					icon_state = "grabbed+1"
 					if (!( affecting.buckled ))
@@ -217,8 +216,7 @@
 					hud1.name = "disarm/kill"
 				else
 					if (state >= 3 && !killing)
-						for(var/mob/O in viewers(assailant, null))
-							O.show_message(text("\red [] starts to tighten \his grip on []'s neck!", assailant, affecting), 1)
+						visible_message("\red [assailant] starts to tighten \his grip on [affecting]'s neck!")
 						hud1.icon_state = "disarm/kill1"
 						killing = 1
 						if(do_after(assailant, 50))
@@ -232,20 +230,15 @@
 								return
 							killing = 2
 							kill_loc = assailant.loc
-							for(var/mob/O in viewers(assailant, null))
-								O.show_message(text("\red [] has tightened \his grip on []'s neck!", assailant, affecting), 1)
+							visible_message("\red [assailant] has tightened \his grip on [affecting]'s neck!")
 							affecting.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been strangled (kill intent) by [assailant.name] ([assailant.ckey])</font>")
 							assailant.attack_log += text("\[[time_stamp()]\] <font color='red'>Strangled (kill intent) [affecting.name] ([affecting.ckey])</font>")
 							log_attack("<font color='red'>[assailant.name] ([assailant.ckey]) Strangled (kill intent) [affecting.name] ([affecting.ckey])</font>")

-							log_admin("ATTACK: [assailant.name] ([assailant.ckey]) Strangled (kill intent) [affecting.name] ([affecting.ckey])")
-							msg_admin_attack("ATTACK: [assailant.name] ([assailant.ckey]) Strangled (kill intent) [affecting.name] ([affecting.ckey])")
-
 							assailant.next_move = world.time + 10
 							affecting.losebreath += 1
 						else
-							for(var/mob/O in viewers(assailant, null))
-								O.show_message(text("\red [] was unable to tighten \his grip on []'s neck!", assailant, affecting), 1)
+							visible_message("\red [assailant] was unable to tighten \his grip on [affecting]'s neck!")
 							killing = 0
 							hud1.icon_state = "disarm/kill"
 	return
@@ -276,16 +269,12 @@
 	if(M == assailant && state >= 2)
 		if( ( ishuman(user) && (FAT in user.mutations) && ismonkey(affecting) ) || ( isalien(user) && iscarbon(affecting) ) )
 			var/mob/living/carbon/attacker = user
-			for(var/mob/N in viewers(user, null))
-				if(N.client)
-					N.show_message(text("\red <B>[user] is attempting to devour [affecting]!</B>"), 1)
+			visible_message("\red <B>[user] is attempting to devour [affecting]!</B>")
 			if(istype(user, /mob/living/carbon/alien/humanoid/hunter))
 				if(!do_mob(user, affecting)||!do_after(user, 30)) return
 			else
 				if(!do_mob(user, affecting)||!do_after(user, 100)) return
-			for(var/mob/N in viewers(user, null))
-				if(N.client)
-					N.show_message(text("\red <B>[user] devours [affecting]!</B>"), 1)
+			visible_message("\red <B>[user] devours [affecting]!</B>")
 			affecting.loc = user
 			attacker.stomach_contents.Add(affecting)
 			del(src)
@@ -25,13 +25,6 @@


 	proc/new_player_panel_proc()
-		//no db for now
-		/*var/user = sqlfdbklogin
-		var/pass = sqlfdbkpass
-		var/db = sqlfdbkdb
-		var/address = sqladdress
-		var/port = sqlport*/
-
 		var/output = "<B>New Player Options</B>"
 		output +="<hr>"
 		output += "<br><a href='byond://?src=\ref[src];show_preferences=1'>Setup Character</A><br><br>"
@@ -49,9 +42,8 @@
 		output += "<a href='byond://?src=\ref[src];observe=1'>Observe</A><br><br>"
 		output += "<a href='byond://?src=\ref[src];pregame_music=1'>Lobby Music</A>"

-		/*if(!IsGuestKey(src.key))
-			var/DBConnection/dbcon = new()
-			dbcon.Connect("dbi:mysql:[db]:[address]:[port]","[user]","[pass]")
+		if(!IsGuestKey(src.key))
+			establish_db_connection()

 			if(dbcon.IsConnected())
 				var/isadmin = 0
@@ -68,8 +60,6 @@
 					output += "<p><b><a href='byond://?src=\ref[src];showpoll=1'>Show Player Polls</A> (NEW!)</b></p>"
 				else
 					output += "<p><a href='byond://?src=\ref[src];showpoll=1'>Show Player Polls</A></p>"
-			dbcon.Disconnect()*/
-
 		src << browse(output,"window=playersetup;size=250x258;can_close=0")
 		return

@@ -219,18 +209,7 @@
 			F["pregame_music"] << preferences.pregame_music

 		if(href_list["privacy_poll"])
-			usr << "\red DB usage has been disabled and that option should not have been available."
-			return
-
-			var/user = sqlfdbklogin
-			var/pass = sqlfdbkpass
-			var/db = sqlfdbkdb
-			var/address = sqladdress
-			var/port = sqlport
-
-			var/DBConnection/dbcon = new()
-
-			dbcon.Connect("dbi:mysql:[db]:[address]:[port]","[user]","[pass]")
+			establish_db_connection()
 			if(!dbcon.IsConnected())
 				return
 			var/voted = 0
@@ -267,8 +246,6 @@
 				usr << "<b>Thank you for your vote!</b>"
 				usr << browse(null,"window=privacypoll")

-			dbcon.Disconnect()
-
 		if(!ready && href_list["preference"])
 			preferences.process_link(src, href_list)
 		else if(!href_list["late_join"])
@@ -1,14 +1,6 @@

 /mob/new_player/proc/handle_privacy_poll()
-	var/user = sqlfdbklogin
-	var/pass = sqlfdbkpass
-	var/db = sqlfdbkdb
-	var/address = sqladdress
-	var/port = sqlport
-
-	var/DBConnection/dbcon = new()
-
-	dbcon.Connect("dbi:mysql:[db]:[address]:[port]","[user]","[pass]")
+	establish_db_connection()
 	if(!dbcon.IsConnected())
 		return
 	var/voted = 0
@@ -22,8 +14,6 @@
 	if(!voted)
 		privacy_poll()

-	dbcon.Disconnect()
-
 /mob/new_player/proc/privacy_poll()
 	var/output = "<div align='center'><B>Player poll</B>"
 	output +="<hr>"
@@ -57,15 +47,7 @@
 	var/optiontext

 /mob/new_player/proc/handle_player_polling()
-
-	var/user = sqlfdbklogin
-	var/pass = sqlfdbkpass
-	var/db = sqlfdbkdb
-	var/address = sqladdress
-	var/port = sqlport
-
-	var/DBConnection/dbcon = new()
-	dbcon.Connect("dbi:mysql:[db]:[address]:[port]","[user]","[pass]")
+	establish_db_connection()
 	if(dbcon.IsConnected())
 		var/isadmin = 0
 		if(src.client && src.client.holder)
@@ -95,20 +77,11 @@

 		src << browse(output,"window=playerpolllist;size=500x300")

-	dbcon.Disconnect()


 /mob/new_player/proc/poll_player(var/pollid = -1)
 	if(pollid == -1) return
-
-	var/user = sqlfdbklogin
-	var/pass = sqlfdbkpass
-	var/db = sqlfdbkdb
-	var/address = sqladdress
-	var/port = sqlport
-
-	var/DBConnection/dbcon = new()
-	dbcon.Connect("dbi:mysql:[db]:[address]:[port]","[user]","[pass]")
+	establish_db_connection()
 	if(dbcon.IsConnected())

 		var/DBQuery/select_query = dbcon.NewQuery("SELECT starttime, endtime, question, polltype FROM erro_poll_question WHERE id = [pollid]")
@@ -155,8 +128,6 @@
 					PO.optiontext = options_query.item[2]
 					options += PO

-				dbcon.Disconnect()
-
 				var/output = "<div align='center'><B>Player poll</B>"
 				output +="<hr>"
 				output += "<b>Question: [pollquestion]</b><br>"
@@ -308,15 +279,7 @@

 	if(!isnum(pollid) || !isnum(optionid))
 		return
-
-	var/user = sqlfdbklogin
-	var/pass = sqlfdbkpass
-	var/db = sqlfdbkdb
-	var/address = sqladdress
-	var/port = sqlport
-
-	var/DBConnection/dbcon = new()
-	dbcon.Connect("dbi:mysql:[db]:[address]:[port]","[user]","[pass]")
+	establish_db_connection()
 	if(dbcon.IsConnected())

 		var/DBQuery/select_query = dbcon.NewQuery("SELECT starttime, endtime, question, polltype FROM erro_poll_question WHERE id = [pollid] AND Now() BETWEEN starttime AND endtime")
@@ -378,15 +341,7 @@

 	if(!isnum(pollid) || !istext(replytext))
 		return
-
-	var/user = sqlfdbklogin
-	var/pass = sqlfdbkpass
-	var/db = sqlfdbkdb
-	var/address = sqladdress
-	var/port = sqlport
-
-	var/DBConnection/dbcon = new()
-	dbcon.Connect("dbi:mysql:[db]:[address]:[port]","[user]","[pass]")
+	establish_db_connection()
 	if(dbcon.IsConnected())

 		var/DBQuery/select_query = dbcon.NewQuery("SELECT starttime, endtime, question, polltype FROM erro_poll_question WHERE id = [pollid] AND Now() BETWEEN starttime AND endtime")
@@ -422,10 +377,10 @@
 			adminrank = usr.client.holder.rank


-		replytext = dd_replacetext(replytext, "%BR%", "")
-		replytext = dd_replacetext(replytext, "\n", "%BR%")
+		replytext = replacetext(replytext, "%BR%", "")
+		replytext = replacetext(replytext, "\n", "%BR%")
 		var/text_pass = reject_bad_text(replytext,8000)
-		replytext = dd_replacetext(replytext, "%BR%", "<BR>")
+		replytext = replacetext(replytext, "%BR%", "<BR>")

 		if(!text_pass)
 			usr << "The text you entered was blank, contained illegal characters or was too long. Please correct the text and submit again."
@@ -444,15 +399,7 @@

 	if(!isnum(pollid) || !isnum(optionid))
 		return
-
-	var/user = sqlfdbklogin
-	var/pass = sqlfdbkpass
-	var/db = sqlfdbkdb
-	var/address = sqladdress
-	var/port = sqlport
-
-	var/DBConnection/dbcon = new()
-	dbcon.Connect("dbi:mysql:[db]:[address]:[port]","[user]","[pass]")
+	establish_db_connection()
 	if(dbcon.IsConnected())

 		var/DBQuery/select_query = dbcon.NewQuery("SELECT starttime, endtime, question, polltype FROM erro_poll_question WHERE id = [pollid] AND Now() BETWEEN starttime AND endtime")
@@ -258,11 +258,11 @@ datum/preferences
 		if(config.allow_Metadata)
 			dat += "<b>OOC Notes:</b> <a href='byond://?src=\ref[user];preference=metadata;task=input'> Edit </a><br>"

-		if((user.client) && (user.client.holder) && (user.client.holder.rank))
+		if(user.client && user.client.holder)
 			dat += "<b>Adminhelp sound</b>: "
 			dat += "[(sound_adminhelp)?"On":"Off"] <a href='byond://?src=\ref[user];preference=hear_adminhelps'>toggle</a><br>"

-			if(user.client.holder.level >= 5)
+			if(config.allow_admin_ooccolor && check_rights(R_FUN,0))
 				dat += "<br><b>OOC</b><br>"
 				dat += "<a href='byond://?src=\ref[user];preference=ooccolor;task=input'>Change color</a> <font face=\"fixedsys\" size=\"3\" color=\"[ooccolor]\"><table style='display:inline;'  bgcolor=\"[ooccolor]\"><tr><td>__</td></tr></table></font><br>"

@@ -748,7 +748,7 @@ datum/preferences
 					if("all")
 						gender = pick(MALE,FEMALE)
 						randomize_name()
-						age = rand(17,45)
+						age = rand(17,85)
 						underwear = rand(1,12)
 						backbag = rand(1,4)
 						randomize_hair_color("hair")
@@ -644,3 +644,44 @@ datum/preferences
 		del(clothes_s)


+proc/skintone2racedescription(var/tone)
+	switch (tone)
+		if(30 to INFINITY)
+			return "albino"
+		if(20 to 30)
+			return "pale"
+		if(5 to 15)
+			return "light skinned"
+		if(-10 to 5)
+			return "white"
+		if(-25 to -10)
+			return "tan"
+		if(-45 to -25)
+			return "darker skinned"
+		if(-65 to -45)
+			return "brown"
+		if(-INFINITY to -65)
+			return "black"
+
+
+proc/age2agedescription(var/age)
+	switch (age)
+		if(0 to 1)
+			return "infant"
+		if(1 to 3)
+			return "toddler"
+		if(3 to 13)
+			return "child"
+		if(13 to 19)
+			return "teenager"
+		if(19 to 30)
+			return "young adult"
+		if(30 to 45)
+			return "adult"
+		if(45 to 60)
+			return "middle-aged"
+		if(60 to 70)
+			return "aging"
+		if(70 to INFINITY)
+			return "elderly"
+
@@ -644,6 +644,7 @@
 						for(var/mob/O in viewers(CM))
 							O.show_message(text("\red <B>[] manages to break the handcuffs!</B>", CM), 1)
 						CM << "\green You successfully break your handcuffs."
+						CM.say(pick("RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", "GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
 						del(CM.handcuffed)
 						CM.handcuffed = null
 						CM.update_inv_handcuffed()
@@ -681,6 +682,7 @@
 						for(var/mob/O in viewers(CM))
 							O.show_message(text("\red <B>[] manages to break the legcuffs!</B>", CM), 1)
 						CM << "\green You successfully break your legcuffs."
+						CM.say(pick("RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", "GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
 						del(CM.legcuffed)
 						CM.legcuffed = null
 						CM.update_inv_legcuffed()