Changed a lot of things, too lazy to recall them atm. Attempted a shotgun-on-back fix, but didn't work.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@305 316c924e-a436-60f5-8080-3fe189b3f50e

code/WorkInProgress/Chemistry-Reagents.dm

@@ -44,7 +44,20 @@ datum
 			on_mob_life(var/mob/M)
 				holder.remove_reagent(src.id, 0.4) //By default it slowly disappears.
 				return
-
+/*
+		metroid
+			name = "Metroid Jelly"
+			id = "metroid"
+			description = "A green liquid produced from one of the deadliest lifeforms in existence."
+			reagent_state = LIQUID
+			on_mob_life(var/mob/M)
+				if(prob(10))
+					M << "You don't feel too good."
+					M.toxloss+=20
+				else if(prob(40))
+					M.bruteloss-=5
+				..() //Code no work :< -- Urist
+*/
 		milk
 			name = "Milk"
 			id = "milk"

code/WorkInProgress/Chemistry-Tools.dm

@@ -1912,4 +1912,36 @@
 			icon_state = "glass_empty"
 			name = "Drinking glass"
 			desc = "Your standard drinking glass"
-			return
+			return
+
+///jar
+
+/*
+/obj/item/weapon/reagent_containers/food/drinks/jar
+	name = "empty jar"
+	desc = "A jar. You're not sure what it's supposed to hold."
+	icon = 'food.dmi'
+	icon_state = "jar"
+	item_state = "beaker"
+	New()
+		var/datum/reagents/R = new/datum/reagents(50)
+		reagents = R
+		R.my_atom = src
+
+	on_reagent_change()
+		if (reagents.reagent_list.len > 0)
+			switch(reagents.get_master_reagent_id())
+				if("metroid")
+					icon_state = "jar_metroid"
+					name = "metroid jam"
+					desc = "A jar of metroid jam. Delicious!"
+				else
+					icon_state ="jar_what"
+					name = "jar of something"
+					desc = "You can't really tell what this is."
+		else
+			icon_state = "jar"
+			name = "empty jar"
+			desc = "A jar. You're not sure what it's supposed to hold."
+			return //Code no work :< -- Urist
+			*/

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

@@ -0,0 +1,8 @@
+/mob/living/carbon/alien/larva/metroid
+	name = "baby metroid"
+	icon = 'mob.dmi'
+	icon_state = "metroid"
+
+	health = 250
+
+	update_icon = 0

code/defines/mob/mob.dm

@@ -39,6 +39,7 @@
 	var/poll_answer = 0.0
 	var/sdisabilities = 0
 	var/disabilities = 0
+	var/midis = 1 //Check if midis should be played for someone -- Urist
 	var/atom/movable/pulling = null
 	var/stat = 0.0
 	var/next_move = null

code/defines/obj/weapon.dm

@@ -517,7 +517,7 @@
 /obj/item/weapon/gun/shotgun
 	name = "shotgun"
 	icon_state = "shotgun"
-	w_class = 4.0
+	w_class = 3.0 //should go on back now, has no sprite for that atm because I can't sprite for shit -- Urist
 	force = 7.0
 	flags =  FPRINT | TABLEPASS | CONDUCT | USEDELAY
 	var/pumped = 0.0

code/game/machinery/processor.dm

@@ -47,9 +47,23 @@ obj/machinery/processor/attackby(var/obj/item/O as obj, var/mob/user as mob)
 			new /obj/item/weapon/reagent_containers/food/snacks/ketchup(src.loc)
 			return
 	user << "There doesn't appear to be anything in the processing chamber."
-
-
-
+/*
+/obj/machinery/processor/attackby(obj/item/weapon/grab/G as obj, mob/user as mob)
+	if(istype(G.affecting, /mob/living/carbon/alien/larva/metroid))
+		sleep(40)
+		playsound(src.loc, 'blender.ogg', 50, 1)
+		for(var/mob/V in viewers(src, null))
+			V.show_message(text("\blue [user] turns on \a [src]."))
+		var/mob/dead/observer/newmob
+		if (G.affecting.client)
+			newmob = new/mob/dead/observer(G.affecting)
+			G.affecting:client:mob = newmob
+			newmob:client:eye = newmob
+		del(G.affecting)
+		del(G)
+		var/obj/item/weapon/reagent_containers/food/drinks/jar/J = new /obj/item/weapon/reagent_containers/food/drinks/jar(src.loc)
+		J.add_reagent("metroid",50) //Code no work :< -- Urist
+*/
 /*
 /obj/item/weapon/reagent_containers/food/snacks/grown/berries
 

code/game/objects/kitchen.dm

@@ -22,7 +22,7 @@
 
 		else
 			user << "\red The spike already has something on it, finish collecting its meat first!"
-	else if(istype(G.affecting, /mob/living/carbon/alien))
+	else if(istype(G.affecting, /mob/living/carbon/alien) && !istype(G.affecting, /mob/living/carbon/alien/larva/metroid))
 		if(src.occupied == 0)
 			src.icon_state = "spikebloodygreen"
 			src.occupied = 1

code/game/verbs/sound.dm

@@ -0,0 +1,11 @@
+/mob/verb/togglemidis()
+	set category = "Special Verbs"
+	set name = "Toggle Midis"
+
+	if(usr.midis)
+		usr.midis=0
+		usr << "You will now stop receiving any sounds uploaded by admins."
+	else
+		usr.midis=1
+		usr << "You will now start receiving any sounds uploaded by admins."
+	return

code/modules/admin/admin.dm

@@ -1155,6 +1155,15 @@ var/showadminmessages = 1
 					else
 						alert("You cannot perform this action. You must be of a higher administrative rank!")
 						return
+				if("dorf")
+					if (src.rank in list("Shit Guy","Coder", "Host"))
+						for(var/mob/living/carbon/human/B in world)
+							B.face_icon_state = "facial_longbeard"
+							B.update_face()
+						message_admins("[key_name_admin(usr)] activated dorf mode")
+					else
+						alert("You cannot perform this action. You must be of a higher administrative rank!")
+						return
 			if (usr)
 				log_admin("[key_name(usr)] used secret [href_list["secretsfun"]]")
 				if (ok)
@@ -1486,7 +1495,8 @@ var/showadminmessages = 1
 <A href='?src=\ref[src];secretsfun=cleanexcrement'>Remove all urine/poo from station</A><BR>
 <A href='?src=\ref[src];secretsfun=retardify'>Make all players retarded</A><BR>
 <A href='?src=\ref[src];secretsfun=fakeguns'>Make all items look like guns</A><BR>
-<A href='?src=\ref[src];secretsfun=schoolgirl'>Japanese Animes Mode</A><BR><BR>"}
+<A href='?src=\ref[src];secretsfun=schoolgirl'>Japanese Animes Mode</A><BR>
+<A href='?src=\ref[src];secretsfun=dorf'>Dorf Mode</A><BR><BR>"}
 //<A href='?src=\ref[src];secretsfun=shockwave'>Station Shockwave</A><BR>
 
 	if(lvl >= 5)

code/modules/admin/verbs/playsound.dm

@@ -1,5 +1,5 @@
 /client/proc/play_sound(S as sound)
-	set category = "Special Verbs"
+	set category = "Fun"
 	set name = "Play Global Sound"
 
 	//if(Debug2)
@@ -14,13 +14,17 @@
 	if(src.holder.rank == "Host" || src.holder.rank == "Coder" || src.holder.rank == "Shit Guy")
 		log_admin("[key_name(src)] played sound [S]")
 		message_admins("[key_name_admin(src)] played sound [S]", 1)
-		world << uploaded_sound
+		for(var/mob/M in world)
+			if(M.midis)
+				M << uploaded_sound
 	else
 		if(usr.client.canplaysound)
 			usr.client.canplaysound = 0
 			log_admin("[key_name(src)] played sound [S]")
 			message_admins("[key_name_admin(src)] played sound [S]", 1)
-			world << uploaded_sound
+			for(var/mob/M in world)
+				if(M.midis)
+					M << uploaded_sound
 		else
 			usr << "You already used up your jukebox monies this round!"
 			del(uploaded_sound)
@@ -36,7 +40,9 @@
 	set category = "Fun"
 	set name = "Cuban Pete Time"
 
-	world << 'cubanpetetime.ogg'
+	for(var/mob/M in world)
+		if(M.midis)
+			M << 'cubanpetetime.ogg'
 
 	for(var/mob/living/carbon/human/CP in world)
 		if(CP.real_name=="Cuban Pete" && CP.key!="Rosham")

code/modules/admin/verbs/randomverbs.dm

@@ -165,7 +165,7 @@
 
 
 /client/proc/cmd_admin_add_random_ai_law()
-	set category = "Admin"
+	set category = "Fun"
 	set name = "Add Random AI Law"
 	if(!src.authenticated || !src.holder)
 		src << "Only administrators may use this command."
@@ -229,7 +229,7 @@
 
 
 /client/proc/cmd_admin_add_freeform_ai_law()
-	set category = "Admin"
+	set category = "Fun"
 	set name = "Add Custom AI law"
 	if(!src.authenticated || !src.holder)
 		src << "Only administrators may use this command."
@@ -361,7 +361,7 @@
 
 /client/proc/cmd_admin_gib_self()
 	set name = "Gibself"
-	set category = "Special Verbs"
+	set category = "Fun"
 	if (istype(src.mob, /mob/dead/observer)) // so they don't spam gibs everywhere
 		return
 	else

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

@@ -63,7 +63,7 @@ to clean it up, or just beat the shit out of it (which takes ages).
 		src << "\blue Your icons have been generated!"
 
 		update_clothing()
-	spawn(1200) grow() // Grow after 120 seconds -- TLE
+//	spawn(1200) grow()  Grow after 120 seconds -- TLE Commented out because life.dm has better version -- Urist
 	..()
 
 
@@ -544,11 +544,11 @@ to clean it up, or just beat the shit out of it (which takes ages).
 		src.stat = 0
 
 
-
+/* Commented out because it's duplicated in life.dm
 /mob/living/carbon/alien/larva/proc/grow() // Larvae can grow into full fledged Xenos if they survive long enough -- TLE
 	if(src.icon_state == "larva_l" && !src.canmove) // This is a shit death check. It is made of shit and death. Fix later.
 		return
 	else
 		var/mob/living/carbon/alien/humanoid/A = new(src.loc)
 		A.key = src.key
-		del(src)
+		del(src) */

code/modules/mob/living/carbon/alien/larva/life.dm

@@ -97,8 +97,9 @@
 				spawn(10)
 					del(src)
 					return
-			//grow!!
-			src.amount_grown++
+			//grow!! but not if metroid or dead
+			if(!istype(src,/mob/living/carbon/alien/larva/metroid) && src.health>-100)
+				src.amount_grown++
 
 			if (src.radiation)
 				if (src.radiation > 100)

code/modules/mob/new_player/preferences.dm

@@ -5,6 +5,7 @@ datum/preferences
 	var/b_type = "A+"
 
 	var/be_syndicate
+	var/midis = 1
 	var/be_random_name = 0
 	var/underwear = 1
 
@@ -154,6 +155,7 @@ datum/preferences
 
 		dat += "<br>"
 		dat += "<b>UI Style:</b> <a href=\"byond://?src=\ref[user];preferences=1;UI=input\"><b>[src.UI == 'screen1.dmi' ? "New" : "Old"]</b></a><br>"
+		dat += "<b>Play admin midis:</b> <a href=\"byond://?src=\ref[user];preferences=1;midis=input\"><b>[src.midis == 1 ? "Yes" : "No"]</b></a><br>"
 
 		dat += "<hr><b>Occupation Choices</b><br>"
 		if (destructive.Find(src.occupation1))
@@ -498,6 +500,12 @@ datum/preferences
 			else
 				src.UI = 'screen1.dmi'
 
+		if (link_tags["midis"])
+			if (src.midis)
+				src.midis = 0
+			else
+				src.midis = 1
+
 		if (link_tags["underwear"])
 			if(!IsGuestKey(user.key))
 				if (src.underwear == 1)
@@ -544,6 +552,7 @@ datum/preferences
 			s_tone = 0.0
 			b_type = "A+"
 			UI = 'screen1_old.dmi'
+			midis = 1
 
 
 		src.ShowChoices(user)
@@ -576,6 +585,7 @@ datum/preferences
 		character.f_style = f_style
 
 		character.UI = UI
+		character.midis = midis
 
 		switch(h_style)
 			if("Short Hair")