- Changed the contract_disease proc clothing checks with respect to permeability_coefficient.

- Spaceacillin no longer heals all viruses. - Some diseases must be cured with two or more chemicals simultaneously. - Tweaked magnitis disease (now affects cyborgs). - Added wizarditis disease. - Tweaked some item properties. - Added leather gloves for the Botanists. - Some suits cannot be placed into backpack. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@321 316c924e-a436-60f5-8080-3fe189b3f50e
2025-02-26 09:04:50 +00:00 · 2010-10-19 07:46:50 +00:00
parent 0540c60c49
commit 5360dc1ac5
20 changed files with 318 additions and 367 deletions
--- a/code/WorkInProgress/Chemistry-Machinery.dm
+++ b/code/WorkInProgress/Chemistry-Machinery.dm
@@ -332,6 +332,10 @@
 				src.temphtml = "The replicator is not ready yet."
 			src.updateUsrDialog()
 			return
+		else if (href_list["empty_beaker"])
+			beaker.reagents.clear_reagents()
+			src.updateUsrDialog()
+			return
 		else if (href_list["eject"])
 			beaker:loc = src.loc
 			beaker = null
@@ -397,7 +401,7 @@
 						dat += "nothing<BR>"
 				else
 					dat += "nothing<BR>"
-			dat += "<BR><A href='?src=\ref[src];eject=1'>Eject beaker</A><BR>"
+			dat += "<BR><A href='?src=\ref[src];eject=1'>Eject beaker</A>[((R.total_volume&&R.reagent_list.len) ? "-- <A href='?src=\ref[src];empty_beaker=1'>Empty beaker</A>":"")]<BR>"
 			dat += "<A href='?src=\ref[user];mach_close=pandemic'>Close</A>"

 		user << browse("<TITLE>PanD.E.M.I.C 2200</TITLE><BR>[dat]", "window=pandemic;size=575x400")
--- a/code/WorkInProgress/Chemistry-Reagents.dm
+++ b/code/WorkInProgress/Chemistry-Reagents.dm
@@ -592,7 +592,7 @@ datum
 			id = "iron"
 			description = "Pure iron is a metal."
 			reagent_state = SOLID
-
+/*
 			on_mob_life(var/mob/M)
 				if(!M) M = holder.my_atom
 				if((M.virus) && (prob(8) && (M.virus.name=="Magnitis")))
@@ -604,6 +604,7 @@ datum
 						M.virus = null
 				holder.remove_reagent(src.id, 0.2)
 				return
+*/

 		aluminium
 			name = "Aluminium"
@@ -952,15 +953,7 @@ datum
 			description = "An all-purpose antiviral agent."
 			reagent_state = LIQUID

-			on_mob_life(var/mob/M)
-				if(!M) M = holder.my_atom
-				if((M.virus) && (prob(8) && (M.virus.name!="Magnitis")))
-					if(M.virus.spread == "Airborne")
-						M.virus.spread = "Remissive"
-					M.virus.stage--
-					if(M.virus.stage <= 0)
-						M.resistances += M.virus.type
-						M.virus = null
+			on_mob_life(var/mob/M)//no more mr. panacea
 				holder.remove_reagent(src.id, 0.2)
 				return

@@ -1255,7 +1248,6 @@ datum
 			description = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936!"
 			reagent_state = LIQUID
 			on_mob_life(var/mob/M)
-				..()
 				M.dizziness = max(0,M.dizziness-5)
 				M:drowsyness = max(0,M:drowsyness-3)
 				M:sleeping = 0
--- a/code/WorkInProgress/Chemistry-Tools.dm
+++ b/code/WorkInProgress/Chemistry-Tools.dm
@@ -1218,7 +1218,7 @@
 		R.add_reagent("blood", 20, data)

 /obj/item/weapon/reagent_containers/glass/bottle/magnitis
-	name = "GBS culture bottle"
+	name = "Magnitis culture bottle"
 	desc = "A small bottle. Contains a small dosage of Fukkos Miracos."
 	icon = 'chemical.dmi'
 	icon_state = "bottle3"
@@ -1233,6 +1233,23 @@
 		R.add_reagent("blood", 20, data)


+/obj/item/weapon/reagent_containers/glass/bottle/wizarditis
+	name = "Wizarditis culture bottle"
+	desc = "A small bottle. Contains a sample of Rincewindus Vulgaris."
+	icon = 'chemical.dmi'
+	icon_state = "bottle3"
+	amount_per_transfer_from_this = 5
+
+	New()
+		var/datum/reagents/R = new/datum/reagents(20)
+		reagents = R
+		R.my_atom = src
+		var/datum/disease/F = new /datum/disease/wizarditis
+		var/list/data = list("virus"= F)
+		R.add_reagent("blood", 20, data)
+
+
+
 /obj/item/weapon/reagent_containers/glass/beaker
 	name = "beaker"
 	desc = "A beaker. Can hold up to 30 units."
--- a/code/datums/disease.dm
+++ b/code/datums/disease.dm
@@ -3,6 +3,8 @@
 	var/stage = 1 //all diseases start at stage 1
 	var/max_stages = 0.0
 	var/cure = null
+	var/cure_id = null// reagent.id or list containing them
+	var/cure_chance = 8//chance for the cure to do its job
 	var/spread = null
 	var/list/affected_species = list()
 	var/mob/affected_mob = null
@@ -11,28 +13,47 @@
 	var/list/strain_data = list() //This is passed on to infectees
 	var/stage_prob = 5		// probability of advancing to next stage, default 5% per check
 	var/agent = "some microbes"//name of the disease agent
+	var/permeability_mod = 0//permeability modifier. Positive gives better chance, negative - worse.

 /datum/disease/proc/stage_act()
 	if(carrier)
+		//world << "[affected_mob] is carrier"
 		return
+
+	var/cure_present = has_cure()
+	//world << "[cure_present]"
+
+	spread = (cure_present?"Remissive":initial(spread))
+
 	if(stage > max_stages)
 		stage = max_stages
 	if(prob(stage_prob) && stage != max_stages)
 		stage++
-	else if(prob(1) && stage != 1)
+	if(stage != 1 && (prob(1) || (cure_present && prob(cure_chance))))
 		stage--
-	else if(prob(1) && stage == 1 && affected_mob.virus.curable)
+	else if(stage == 1 && ((prob(1) && affected_mob.virus.curable) || (cure_present && prob(cure_chance))))
 		affected_mob.resistances += affected_mob.virus.type
 		affected_mob.virus = null
 		return
 	return

+/datum/disease/proc/has_cure()
+	if(!cure_id) return 0
+	var/result = 1
+	if(istype(cure_id, /list))
+		for(var/C_id in cure_id)
+			if(!affected_mob.reagents.has_reagent(C_id))
+				result = 0
+	else if(!affected_mob.reagents.has_reagent(cure_id))
+		result = 0
+	return result
+
+
 /mob/proc/contract_disease(var/datum/disease/virus, var/skip_this = 0)

-	var/index = src.resistances.Find(virus.type)
-	if(index)
+	if(src.resistances.Find(virus.type))
 		if(prob(99)) return
-		src.resistances[index] = null//the resistance is futile
+		src.resistances.Remove(virus.type)//the resistance is futile

 	//For alien egg and stuff
 	if(skip_this == 1)
@@ -41,11 +62,95 @@
 		if(prob(5))
 			src.virus.carrier = 1
 		return
+/*
+	var/list/clothing_areas	= list()
+	var/list/covers = list(UPPER_TORSO,LOWER_TORSO,LEGS,FEET,ARMS,HANDS)
+	for(var/Covers in covers)
+		clothing_areas[Covers] = list()
+
+	for(var/obj/item/clothing/Clothing in src)
+		if(Clothing)
+			for(var/Covers in covers)
+				if(Clothing&Covers)
+					clothing_areas[Covers] += Clothing
+
+*/
+	if(prob(15)) return
+
+	var/obj/item/clothing/Cl = null
+	var/passed = 1
+	var/target_zone = pick(1,2,50;3,50;4)//1 - head, 2 - body, 3 - hands, 4- feet

-	var/score
 	if(istype(src, /mob/living/carbon/human))
-		if(src:gloves)
-			score += 5
+		var/mob/living/carbon/human/H = src
+
+		switch(target_zone)
+			if(1)
+				if(H.head)
+					Cl = H.head
+					passed = prob(Cl.permeability_coefficient*100+virus.permeability_mod)
+					//world << "Head pass [passed]"
+				if(passed && H.wear_mask)
+					Cl = H.wear_mask
+					passed = prob(Cl.permeability_coefficient*100+virus.permeability_mod)
+					//world << "Mask pass [passed]"
+			if(2)//arms and legs included
+				if(H.wear_suit)
+					Cl = H.wear_suit
+					passed = prob(Cl.permeability_coefficient*100+virus.permeability_mod)
+					//world << "Suit pass [passed]"
+				if(passed && H.slot_w_uniform)
+					Cl = H.slot_w_uniform
+					passed = prob(Cl.permeability_coefficient*100+virus.permeability_mod)
+					//world << "Uniform pass [passed]"
+			if(3)
+				if(H.wear_suit && H.wear_suit.body_parts_covered&HANDS)
+					Cl = H.wear_suit
+					passed = prob(Cl.permeability_coefficient*100+virus.permeability_mod)
+
+				if(passed && H.gloves)
+					Cl = H.gloves
+					passed = prob(Cl.permeability_coefficient*100+virus.permeability_mod)
+					//world << "Gloves pass [passed]"
+			if(4)
+				if(H.wear_suit && H.wear_suit.body_parts_covered&FEET)
+					Cl = H.wear_suit
+					passed = prob(Cl.permeability_coefficient*100+virus.permeability_mod)
+
+				if(passed && H.shoes)
+					Cl = H.shoes
+					passed = prob(Cl.permeability_coefficient*100+virus.permeability_mod)
+					//world << "Shoes pass [passed]"
+			else
+				src << "Something strange's going on, something's wrong."
+
+			/*if("feet")
+				if(H.shoes && istype(H.shoes, /obj/item/clothing/))
+					Cl = H.shoes
+					passed = prob(Cl.permeability_coefficient*100)
+					//
+					world << "Shoes pass [passed]"
+			*/		//
+	else if(istype(src, /mob/living/carbon/monkey))
+		var/mob/living/carbon/monkey/M = src
+		switch(target_zone)
+			if(1)
+				if(M.wear_mask)
+					Cl = M.wear_mask
+					passed = prob(Cl.permeability_coefficient*100+virus.permeability_mod)
+					//world << "Mask pass [passed]"
+
+	if(passed && virus.spread=="Airborne" && src.internals)
+		passed = prob(60)
+
+	if(passed)
+//		world << "Infection in the mob [src]. YAY"
+
+
+/*
+	var/score = 0
+	if(istype(src, /mob/living/carbon/human))
+		if(src:gloves) score += 5
 		if(istype(src:wear_suit, /obj/item/clothing/suit/space)) score += 10
 		if(istype(src:wear_suit, /obj/item/clothing/suit/bio_suit)) score += 10
 		if(istype(src:head, /obj/item/clothing/head/helmet/space)) score += 5
@@ -60,19 +165,18 @@
 		return
 	else if(score == 20 && prob(95))
 		return
-	else if(score == 15 && prob(75))
+	else if(score >= 15 && prob(75))
 		return
-	else if(score == 10 && prob(55))
+	else if(score >= 10 && prob(55))
 		return
-	else if(score == 5 && prob(35))
+	else if(score >= 5 && prob(35))
 		return
 	else if(prob(15))
 		return
-	else
+	else*/
 		src.virus = virus
 		src.virus.affected_mob = src
 		if(prob(5))
 			src.virus.carrier = 1
 		return
 	return
-
--- a/code/datums/diseases/alien_embryo.dm
+++ b/code/datums/diseases/alien_embryo.dm
@@ -11,6 +11,8 @@
 	max_stages = 5
 	spread = "None"
 	cure = "Unknown"
+	cure_id = list("lexorin","toxin","gargleblaster")
+	cure_chance = 20
 	affected_species = list("Human", "Monkey")

 /datum/disease/alien_embryo/stage_act()
--- a/code/datums/diseases/brainrot.dm
+++ b/code/datums/diseases/brainrot.dm
@@ -3,9 +3,11 @@
 	max_stages = 4
 	spread = "Airborne"
 	cure = "Spaceacillin & Alkysine"
+	cure_id = list("alkysine","spaceacillin")
 	agent = "Cryptococcus Cosmosis"
 	affected_species = list("Human")
 	curable = 0
+	cure_chance = 10

 /datum/disease/brainrot/stage_act()
 	..()
--- a/code/datums/diseases/cold.dm
+++ b/code/datums/diseases/cold.dm
@@ -3,8 +3,10 @@
 	max_stages = 3
 	spread = "Airborne"
 	cure = "Rest"
+	cure = "spaceacillin"
 	agent = "XY-rhinovirus"
 	affected_species = list("Human", "Monkey")
+	permeability_mod = -10

 /datum/disease/cold/stage_act()
 	..()
--- a/code/datums/diseases/dna_spread.dm
+++ b/code/datums/diseases/dna_spread.dm
@@ -2,7 +2,8 @@
 	name = "Space Retrovirus"
 	max_stages = 4
 	spread = "Airborne"
-	cure = "Spaceacillin"
+	cure = "Ryetalin"
+	cure = "ryetalyn"
 	curable = 0
 	agent = "S4E1 retrovirus"
 	affected_species = list("Human")
--- a/code/datums/diseases/fake_gbs.dm
+++ b/code/datums/diseases/fake_gbs.dm
@@ -2,7 +2,8 @@
 	name = "GBS"
 	max_stages = 5
 	spread = "Airborne"
-	cure = "Epilepsy Pills"
+	cure = "Synaptizine & Sulfur"
+	cure_id = list("synaptizine","sulfur")
 	agent = "Gravitokinetic Bipotential SADS-"
 	affected_species = list("Human")

--- a/code/datums/diseases/flu.dm
+++ b/code/datums/diseases/flu.dm
@@ -3,9 +3,11 @@
 	max_stages = 3
 	spread = "Airborne"
 	cure = "Spaceacillin"
+	cure_id = "spaceacillin"
 	agent = "H13N1 flu virion"
 	affected_species = list("Human")
 	curable = 0
+	permeability_mod = -5

 /datum/disease/flu/stage_act()
 	..()
--- a/code/datums/diseases/gbs.dm
+++ b/code/datums/diseases/gbs.dm
@@ -2,10 +2,12 @@
 	name = "GBS"
 	max_stages = 5
 	spread = "Airborne"
-	cure = "Epilepsy Pills"
+	cure = "Synaptizine & Sulfur"
+	cure_id = list("synaptizine","sulfur")
 	agent = "Gravitokinetic Bipotential SADS+"
 	affected_species = list("Human")
 	curable = 0
+	permeability_mod = 1

 /datum/disease/gbs/stage_act()
 	..()
--- a/code/datums/diseases/jungle_fever.dm
+++ b/code/datums/diseases/jungle_fever.dm
@@ -4,3 +4,4 @@
 	cure = "None"
 	spread = "Airborne"
 	affected_species = list("Monkey")
+	curable = 0
--- a/code/datums/diseases/magnitis.dm
+++ b/code/datums/diseases/magnitis.dm
@@ -3,6 +3,7 @@
 	max_stages = 4
 	spread = "Airborne"
 	cure = "Iron"
+	cure_id = "iron"
 	agent = "Fukkos Miracos"
 	affected_species = list("Human")
 	curable = 0
@@ -17,6 +18,9 @@
 				for(var/obj/M in orange(2,affected_mob))
 					if(!M.anchored && (M.flags & CONDUCT))
 						step_towards(M,affected_mob)
+				for(var/mob/living/silicon/S in orange(2,affected_mob))
+					if(istype(S, /mob/living/silicon/ai)) continue
+					step_towards(S,affected_mob)
 						/*
 						if(M.x > affected_mob.x)
 							M.x--
@@ -39,6 +43,12 @@
 						var/iter = rand(1,2)
 						for(i=0,i<iter,i++)
 							step_towards(M,affected_mob)
+				for(var/mob/living/silicon/S in orange(4,affected_mob))
+					if(istype(S, /mob/living/silicon/ai)) continue
+					var/i
+					var/iter = rand(1,2)
+					for(i=0,i<iter,i++)
+						step_towards(S,affected_mob)
 						/*
 						if(M.x > affected_mob.x)
 							M.x-=rand(1,min(3,M.x-affected_mob.x))
@@ -61,6 +71,12 @@
 						var/iter = rand(1,3)
 						for(i=0,i<iter,i++)
 							step_towards(M,affected_mob)
+				for(var/mob/living/silicon/S in orange(6,affected_mob))
+					if(istype(S, /mob/living/silicon/ai)) continue
+					var/i
+					var/iter = rand(1,3)
+					for(i=0,i<iter,i++)
+						step_towards(S,affected_mob)
 						/*
 						if(M.x > affected_mob.x)
 							M.x-=rand(1,min(5,M.x-affected_mob.x))
--- a/code/datums/diseases/wizarditis.dm
+++ b/code/datums/diseases/wizarditis.dm
@@ -0,0 +1,112 @@
+/datum/disease/wizarditis
+	name = "Wizarditis"
+	max_stages = 4
+	spread = "Airborne"
+	cure = "The Manly Dorf"
+	cure_id = "manlydorf"
+	agent = "Rincewindus Vulgaris"
+	affected_species = list("Human")
+	curable = 0
+	permeability_mod = -5
+
+/*
+BIRUZ BENNAR
+SCYAR NILA - teleport
+NEC CANTIO - dis techno
+EI NATH - shocking grasp
+AULIE OXIN FIERA - knock
+TARCOL MINTI ZHERI - forcewall
+STI KALY - blind
+*/
+
+/datum/disease/wizarditis/stage_act()
+	..()
+	switch(stage)
+		if(2)
+			if(prob(4))
+				affected_mob.say(pick("You shall not pass!", "Expeliarmus!", "By Merlins beard!", ""))
+			if(prob(2))
+				affected_mob << "\red You feel [pick("that you don't have enough mana.", "that the winds of magic are gone.", "an urge to summon familiar.")]"
+
+
+		if(3)
+			spawn_wizard_clothes(5)
+			if(prob(4))
+				affected_mob.say(pick("NEC CANTIO!","AULIE OXIN FIERA!", "STI KALY!", "TARCOL MINTI ZHERI!"))
+			if(prob(2))
+				affected_mob << "\red You feel [pick("the magic bubbling in your veins","that this location gives you a +1 to INT","an urge to summon familiar.")]."
+
+		if(4)
+			spawn_wizard_clothes(10)
+			if(prob(4))
+				affected_mob.say(pick("NEC CANTIO!","AULIE OXIN FIERA!","STI KALY!","EI NATH!"))
+				return
+			if(prob(2))
+				affected_mob << "\red You feel [pick("the tidal wave of raw power building inside","that this location gives you a +2 to INT and +1 to WIS","an urge to teleport")]."
+			if(prob(5))
+
+				var/list/theareas = new/list()
+				for(var/area/AR in world)
+					if(theareas.Find(AR)) continue
+					var/turf/picked = pick(get_area_turfs(AR.type))
+					if (picked.z == affected_mob.z)
+						theareas += AR
+
+				var/area/thearea = pick(theareas)
+				affected_mob.say("SCYAR NILA [uppertext(thearea.name)]")
+
+				var/datum/effects/system/harmless_smoke_spread/smoke = new /datum/effects/system/harmless_smoke_spread()
+				smoke.set_up(5, 0, affected_mob.loc)
+				smoke.attach(affected_mob)
+				smoke.start()
+				var/list/L = list()
+				for(var/turf/T in get_area_turfs(thearea.type))
+					if(T.z != affected_mob.z) continue
+					if(!T.density)
+						var/clear = 1
+						for(var/obj/O in T)
+							if(O.density)
+								clear = 0
+								break
+						if(clear)
+							L+=T
+
+				affected_mob.loc = pick(L)
+				smoke.start()
+
+				return
+	return
+
+
+
+/datum/disease/wizarditis/proc/spawn_wizard_clothes(var/chance=5)
+	var/mob/living/carbon/human/H = affected_mob
+	if(prob(chance))
+		if(!istype(H.head, /obj/item/clothing/head/wizard))
+			if(H.head)
+				H.drop_from_slot(H.head)
+			H.head = new /obj/item/clothing/head/wizard(H)
+			H.head.layer = 20
+		return
+	if(prob(chance))
+		if(!istype(H.wear_suit, /obj/item/clothing/suit/wizrobe))
+			if(H.wear_suit)
+				H.drop_from_slot(H.wear_suit)
+			H.wear_suit = new /obj/item/clothing/suit/wizrobe(H)
+			H.wear_suit.layer = 20
+		return
+	if(prob(chance))
+		if(!istype(H.shoes, /obj/item/clothing/shoes/sandal))
+			if(H.shoes)
+				H.drop_from_slot(H.shoes)
+			H.shoes = new /obj/item/clothing/shoes/sandal(H)
+			H.shoes.layer = 20
+		return
+	if(prob(chance))
+		if(!istype(H.r_hand, /obj/item/weapon/staff))
+			if(H.r_hand)
+				H.drop_from_slot(H.r_hand)
+			H.r_hand = new /obj/item/weapon/staff(H)
+			H.r_hand.layer = 20
+		return
+	return
--- a/code/defines/obj/clothing.dm
+++ b/code/defines/obj/clothing.dm
@@ -99,7 +99,7 @@
 	icon_state = "latex"
 	item_state = "lgloves"
 	siemens_coefficient = 0.30
-
+	permeability_coefficient = 0.01
 	protective_temperature = 310
 	heat_transfer_coefficient = 0.90

@@ -128,10 +128,20 @@
 	icon_state = "yellow"
 	item_state = "ygloves"
 	siemens_coefficient = 0
-
+	permeability_coefficient = 0.05
 	protective_temperature = 1000
 	heat_transfer_coefficient = 0.01

+/obj/item/clothing/gloves/botanic_leather
+	desc = "These leather gloves protect against thorns, barbs, prickles, spikes and other harmfull objects of floral origin."
+	name = "botanic leather gloves"
+	icon_state = "leather"
+	item_state = "ggloves"
+	siemens_coefficient = 0.50
+	permeability_coefficient = 0.9
+	protective_temperature = 400
+	heat_transfer_coefficient = 0.70
+
 // HATS. OH MY WHAT A FINE CHAPEAU, GOOD SIR.

 /obj/item/clothing/head
@@ -199,6 +209,7 @@
 	name = "Plague doctor's hat"
 	icon_state = "plaguedoctor"
 	flags = FPRINT | TABLEPASS | HEADSPACE
+	permeability_coefficient = 0.01

 /obj/item/clothing/head/beret
 	name = "beret"
@@ -224,6 +235,7 @@
 	flags = FPRINT | TABLEPASS | HEADSPACE | HEADCOVERSEYES | HEADCOVERSMOUTH
 	see_face = 0.0
 	item_state = "space"
+	permeability_coefficient = 0.01

 /obj/item/clothing/head/helmet/space/syndicate
 	name = "red space helmet"
@@ -343,6 +355,7 @@
 	w_class = 3
 	protective_temperature = 420
 	gas_transfer_coefficient = 0.10
+	permeability_coefficient = 0.10

 /obj/item/clothing/mask/muzzle
 	name = "muzzle"
@@ -454,6 +467,7 @@
 	desc = "A suit that protects against biological contamination."
 	icon_state = "bio"
 	item_state = "bio_suit"
+	w_class = 4//bulky item
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	gas_transfer_coefficient = 0.01
 	permeability_coefficient = 0.01
@@ -557,6 +571,7 @@
 	name = "Captain's armor"
 	icon_state = "caparmor"
 	item_state = "caparmor"
+	w_class = 4//bulky item
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS

 /obj/item/clothing/suit/armor/centcomm
@@ -564,6 +579,7 @@
 	desc = "A suit that protects against some damage."
 	icon_state = "centcom"
 	item_state = "centcom"
+	w_class = 4//bulky item
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS

 /obj/item/clothing/suit/armor/heavy
@@ -571,6 +587,7 @@
 	desc = "A heavily armored suit that protects against moderate damage."
 	icon_state = "heavy"
 	item_state = "swat_suit"
+	w_class = 4//bulky item
 	gas_transfer_coefficient = 0.90
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS

@@ -600,6 +617,7 @@
 	desc = "A suit that protects against fire and heat."
 	icon_state = "fire"
 	item_state = "fire_suit"
+	w_class = 4//bulky item
 	gas_transfer_coefficient = 0.90
 	permeability_coefficient = 0.50
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
@@ -612,7 +630,7 @@
 	desc = "A suit that protects against extreme fire and heat."
 	icon_state = "thermal"
 	item_state = "ro_suit"
-
+	w_class = 4//bulky item
 	protective_temperature = 10000
 	heat_transfer_coefficient = 0.01

@@ -624,6 +642,7 @@
 	icon_state = "space"
 	gas_transfer_coefficient = 0.01
 	item_state = "s_suit"
+	w_class = 4//bulky item
 	flags = FPRINT | TABLEPASS | SUITSPACE
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	permeability_coefficient = 0.02
--- a/code/game/jobs/jobprocs.dm
+++ b/code/game/jobs/jobprocs.dm
@@ -463,7 +463,7 @@
 //			src.equip_if_possible(new /obj/item/device/pda/medical(src), slot_belt)
 			src.equip_if_possible(new /obj/item/clothing/under/rank/hydroponics(src), slot_w_uniform)
 			src.equip_if_possible(new /obj/item/clothing/shoes/black(src), slot_shoes)
-			src.equip_if_possible(new /obj/item/clothing/gloves/latex(src), slot_gloves)
+			src.equip_if_possible(new /obj/item/clothing/gloves/botanic_leather(src), slot_gloves)
 			src.equip_if_possible(new /obj/item/device/analyzer/plant_analyzer(src), slot_l_hand)
 			src.equip_if_possible(new /obj/item/clothing/suit/apron(src), slot_wear_suit)

--- a/code/game/objects/storage/backpack.dm
+++ b/code/game/objects/storage/backpack.dm
@@ -38,6 +38,8 @@
 	if (src.contents.len >= 7)
 		return
 	if (W.w_class > 3 || src.loc == W)
+		if(W.w_class > 3)
+			user << "The [W] is too big to fit into the backpack."
 		return
 	var/t
 	for(var/obj/item/weapon/O in src)
--- a/code/game/supplyshuttle.dm
+++ b/code/game/supplyshuttle.dm
@@ -147,6 +147,7 @@ var/supply_shuttle_points = 50
 					"/obj/item/weapon/reagent_containers/glass/bottle/cold",
 					"/obj/item/weapon/reagent_containers/glass/bottle/fake_gbs",
 					"/obj/item/weapon/reagent_containers/glass/bottle/magnitis",
+					"/obj/item/weapon/reagent_containers/glass/bottle/wizarditis",
 //					"/obj/item/weapon/reagent_containers/glass/bottle/gbs", No. Just no.
 					"/obj/item/weapon/reagent_containers/glass/bottle/brainrot",
 					"/obj/item/weapon/storage/firstaid/syringes",
--- a/goonstation.dme
+++ b/goonstation.dme
@@ -6,452 +6,120 @@
 // END_INTERNALS
 // BEGIN_FILE_DIR
 #define FILE_DIR .
-#define FILE_DIR ".svn"
-#define FILE_DIR ".svn/prop-base"
-#define FILE_DIR ".svn/text-base"
-#define FILE_DIR ".svn/tmp"
 #define FILE_DIR "code"
-#define FILE_DIR "code/.svn"
-#define FILE_DIR "code/.svn/text-base"
 #define FILE_DIR "code/ATMOSPHERICS"
-#define FILE_DIR "code/ATMOSPHERICS/.svn"
-#define FILE_DIR "code/ATMOSPHERICS/.svn/text-base"
 #define FILE_DIR "code/ATMOSPHERICS/components"
-#define FILE_DIR "code/ATMOSPHERICS/components/.svn"
-#define FILE_DIR "code/ATMOSPHERICS/components/.svn/text-base"
 #define FILE_DIR "code/ATMOSPHERICS/components/binary_devices"
-#define FILE_DIR "code/ATMOSPHERICS/components/binary_devices/.svn"
-#define FILE_DIR "code/ATMOSPHERICS/components/binary_devices/.svn/text-base"
 #define FILE_DIR "code/ATMOSPHERICS/components/unary"
-#define FILE_DIR "code/ATMOSPHERICS/components/unary/.svn"
-#define FILE_DIR "code/ATMOSPHERICS/components/unary/.svn/text-base"
-#define FILE_DIR "code/atoms"
-#define FILE_DIR "code/atoms/.svn"
-#define FILE_DIR "code/atoms/clothing"
-#define FILE_DIR "code/atoms/clothing/.svn"
-#define FILE_DIR "code/atoms/mob"
-#define FILE_DIR "code/atoms/mob/.svn"
-#define FILE_DIR "code/atoms/mob/living"
-#define FILE_DIR "code/atoms/mob/living/.svn"
-#define FILE_DIR "code/atoms/mob/living/sapien"
-#define FILE_DIR "code/atoms/mob/living/sapien/.svn"
-#define FILE_DIR "code/atoms/objects"
-#define FILE_DIR "code/atoms/objects/.svn"
-#define FILE_DIR "code/atoms/objects/radio"
-#define FILE_DIR "code/atoms/objects/radio/.svn"
-#define FILE_DIR "code/atoms/objects/storage"
-#define FILE_DIR "code/atoms/objects/storage/.svn"
 #define FILE_DIR "code/datums"
-#define FILE_DIR "code/datums/.svn"
-#define FILE_DIR "code/datums/.svn/text-base"
 #define FILE_DIR "code/datums/diseases"
-#define FILE_DIR "code/datums/diseases/.svn"
-#define FILE_DIR "code/datums/diseases/.svn/text-base"
 #define FILE_DIR "code/defines"
-#define FILE_DIR "code/defines/.svn"
-#define FILE_DIR "code/defines/.svn/text-base"
 #define FILE_DIR "code/defines/area"
-#define FILE_DIR "code/defines/area/.svn"
-#define FILE_DIR "code/defines/area/.svn/text-base"
 #define FILE_DIR "code/defines/mob"
-#define FILE_DIR "code/defines/mob/.svn"
-#define FILE_DIR "code/defines/mob/.svn/text-base"
 #define FILE_DIR "code/defines/mob/dead"
-#define FILE_DIR "code/defines/mob/dead/.svn"
-#define FILE_DIR "code/defines/mob/dead/.svn/text-base"
 #define FILE_DIR "code/defines/mob/living"
-#define FILE_DIR "code/defines/mob/living/.svn"
-#define FILE_DIR "code/defines/mob/living/.svn/text-base"
 #define FILE_DIR "code/defines/mob/living/carbon"
-#define FILE_DIR "code/defines/mob/living/carbon/.svn"
-#define FILE_DIR "code/defines/mob/living/carbon/.svn/text-base"
 #define FILE_DIR "code/defines/mob/living/silicon"
-#define FILE_DIR "code/defines/mob/living/silicon/.svn"
-#define FILE_DIR "code/defines/mob/living/silicon/.svn/text-base"
 #define FILE_DIR "code/defines/obj"
-#define FILE_DIR "code/defines/obj/.svn"
-#define FILE_DIR "code/defines/obj/.svn/text-base"
 #define FILE_DIR "code/defines/obj/clothing"
-#define FILE_DIR "code/defines/obj/clothing/.svn"
-#define FILE_DIR "code/defines/obj/clothing/.svn/text-base"
 #define FILE_DIR "code/defines/obj/spawner"
-#define FILE_DIR "code/defines/obj/spawner/.svn"
-#define FILE_DIR "code/defines/obj/spawner/.svn/text-base"
 #define FILE_DIR "code/defines/procs"
-#define FILE_DIR "code/defines/procs/.svn"
-#define FILE_DIR "code/defines/procs/.svn/text-base"
-#define FILE_DIR "code/defines/turf"
-#define FILE_DIR "code/defines/turf/.svn"
 #define FILE_DIR "code/FEA"
-#define FILE_DIR "code/FEA/.svn"
-#define FILE_DIR "code/FEA/.svn/text-base"
 #define FILE_DIR "code/game"
-#define FILE_DIR "code/game/.svn"
-#define FILE_DIR "code/game/.svn/text-base"
 #define FILE_DIR "code/game/area"
-#define FILE_DIR "code/game/area/.svn"
-#define FILE_DIR "code/game/area/.svn/text-base"
 #define FILE_DIR "code/game/gamemodes"
-#define FILE_DIR "code/game/gamemodes/.svn"
-#define FILE_DIR "code/game/gamemodes/.svn/text-base"
 #define FILE_DIR "code/game/gamemodes/blob"
-#define FILE_DIR "code/game/gamemodes/blob/.svn"
-#define FILE_DIR "code/game/gamemodes/blob/.svn/text-base"
 #define FILE_DIR "code/game/gamemodes/changeling"
-#define FILE_DIR "code/game/gamemodes/changeling/.svn"
-#define FILE_DIR "code/game/gamemodes/changeling/.svn/text-base"
 #define FILE_DIR "code/game/gamemodes/ctf"
-#define FILE_DIR "code/game/gamemodes/ctf/.svn"
-#define FILE_DIR "code/game/gamemodes/ctf/.svn/text-base"
 #define FILE_DIR "code/game/gamemodes/deathmatch"
-#define FILE_DIR "code/game/gamemodes/deathmatch/.svn"
-#define FILE_DIR "code/game/gamemodes/deathmatch/.svn/text-base"
 #define FILE_DIR "code/game/gamemodes/extended"
-#define FILE_DIR "code/game/gamemodes/extended/.svn"
-#define FILE_DIR "code/game/gamemodes/extended/.svn/text-base"
 #define FILE_DIR "code/game/gamemodes/malfunction"
-#define FILE_DIR "code/game/gamemodes/malfunction/.svn"
-#define FILE_DIR "code/game/gamemodes/malfunction/.svn/text-base"
 #define FILE_DIR "code/game/gamemodes/meteor"
-#define FILE_DIR "code/game/gamemodes/meteor/.svn"
-#define FILE_DIR "code/game/gamemodes/meteor/.svn/text-base"
 #define FILE_DIR "code/game/gamemodes/monkey"
-#define FILE_DIR "code/game/gamemodes/monkey/.svn"
-#define FILE_DIR "code/game/gamemodes/monkey/.svn/text-base"
 #define FILE_DIR "code/game/gamemodes/nuclear"
-#define FILE_DIR "code/game/gamemodes/nuclear/.svn"
-#define FILE_DIR "code/game/gamemodes/nuclear/.svn/text-base"
 #define FILE_DIR "code/game/gamemodes/restructuring"
-#define FILE_DIR "code/game/gamemodes/restructuring/.svn"
-#define FILE_DIR "code/game/gamemodes/restructuring/.svn/text-base"
 #define FILE_DIR "code/game/gamemodes/revolution"
-#define FILE_DIR "code/game/gamemodes/revolution/.svn"
-#define FILE_DIR "code/game/gamemodes/revolution/.svn/text-base"
 #define FILE_DIR "code/game/gamemodes/ruby"
-#define FILE_DIR "code/game/gamemodes/ruby/.svn"
-#define FILE_DIR "code/game/gamemodes/ruby/.svn/text-base"
 #define FILE_DIR "code/game/gamemodes/sandbox"
-#define FILE_DIR "code/game/gamemodes/sandbox/.svn"
-#define FILE_DIR "code/game/gamemodes/sandbox/.svn/text-base"
 #define FILE_DIR "code/game/gamemodes/traitor"
-#define FILE_DIR "code/game/gamemodes/traitor/.svn"
-#define FILE_DIR "code/game/gamemodes/traitor/.svn/text-base"
 #define FILE_DIR "code/game/gamemodes/wizard"
-#define FILE_DIR "code/game/gamemodes/wizard/.svn"
-#define FILE_DIR "code/game/gamemodes/wizard/.svn/text-base"
 #define FILE_DIR "code/game/jobs"
-#define FILE_DIR "code/game/jobs/.svn"
-#define FILE_DIR "code/game/jobs/.svn/text-base"
-#define FILE_DIR "code/game/jobs/.svn/tmp"
 #define FILE_DIR "code/game/machinery"
-#define FILE_DIR "code/game/machinery/.svn"
-#define FILE_DIR "code/game/machinery/.svn/text-base"
-#define FILE_DIR "code/game/machinery/antimatter_engine"
-#define FILE_DIR "code/game/machinery/antimatter_engine/.svn"
 #define FILE_DIR "code/game/machinery/atmoalter"
-#define FILE_DIR "code/game/machinery/atmoalter/.svn"
-#define FILE_DIR "code/game/machinery/atmoalter/.svn/text-base"
 #define FILE_DIR "code/game/machinery/bots"
-#define FILE_DIR "code/game/machinery/bots/.svn"
-#define FILE_DIR "code/game/machinery/bots/.svn/text-base"
 #define FILE_DIR "code/game/machinery/computer"
-#define FILE_DIR "code/game/machinery/computer/.svn"
-#define FILE_DIR "code/game/machinery/computer/.svn/text-base"
 #define FILE_DIR "code/game/machinery/doors"
-#define FILE_DIR "code/game/machinery/doors/.svn"
-#define FILE_DIR "code/game/machinery/doors/.svn/text-base"
 #define FILE_DIR "code/game/machinery/embedded_controller"
-#define FILE_DIR "code/game/machinery/embedded_controller/.svn"
-#define FILE_DIR "code/game/machinery/embedded_controller/.svn/text-base"
 #define FILE_DIR "code/game/machinery/pipe"
-#define FILE_DIR "code/game/machinery/pipe/.svn"
-#define FILE_DIR "code/game/machinery/pipe/.svn/text-base"
-#define FILE_DIR "code/game/machinery/power"
-#define FILE_DIR "code/game/machinery/power/.svn"
 #define FILE_DIR "code/game/magic"
-#define FILE_DIR "code/game/magic/.svn"
-#define FILE_DIR "code/game/magic/.svn/text-base"
 #define FILE_DIR "code/game/magic/cultist"
-#define FILE_DIR "code/game/magic/cultist/.svn"
-#define FILE_DIR "code/game/magic/cultist/.svn/text-base"
 #define FILE_DIR "code/game/objects"
-#define FILE_DIR "code/game/objects/.svn"
-#define FILE_DIR "code/game/objects/.svn/text-base"
 #define FILE_DIR "code/game/objects/alien"
-#define FILE_DIR "code/game/objects/alien/.svn"
-#define FILE_DIR "code/game/objects/alien/.svn/text-base"
 #define FILE_DIR "code/game/objects/closets"
-#define FILE_DIR "code/game/objects/closets/.svn"
-#define FILE_DIR "code/game/objects/closets/.svn/text-base"
 #define FILE_DIR "code/game/objects/closets/secure"
-#define FILE_DIR "code/game/objects/closets/secure/.svn"
-#define FILE_DIR "code/game/objects/closets/secure/.svn/text-base"
 #define FILE_DIR "code/game/objects/devices"
-#define FILE_DIR "code/game/objects/devices/.svn"
-#define FILE_DIR "code/game/objects/devices/.svn/text-base"
 #define FILE_DIR "code/game/objects/items"
-#define FILE_DIR "code/game/objects/items/.svn"
-#define FILE_DIR "code/game/objects/items/.svn/text-base"
 #define FILE_DIR "code/game/objects/items/weapons"
-#define FILE_DIR "code/game/objects/items/weapons/.svn"
-#define FILE_DIR "code/game/objects/items/weapons/.svn/text-base"
 #define FILE_DIR "code/game/objects/radio"
-#define FILE_DIR "code/game/objects/radio/.svn"
-#define FILE_DIR "code/game/objects/radio/.svn/text-base"
 #define FILE_DIR "code/game/objects/secstorage"
-#define FILE_DIR "code/game/objects/secstorage/.svn"
-#define FILE_DIR "code/game/objects/secstorage/.svn/text-base"
 #define FILE_DIR "code/game/objects/spawners"
-#define FILE_DIR "code/game/objects/spawners/.svn"
-#define FILE_DIR "code/game/objects/spawners/.svn/text-base"
 #define FILE_DIR "code/game/objects/storage"
-#define FILE_DIR "code/game/objects/storage/.svn"
-#define FILE_DIR "code/game/objects/storage/.svn/text-base"
 #define FILE_DIR "code/game/spacecraft"
-#define FILE_DIR "code/game/spacecraft/.svn"
-#define FILE_DIR "code/game/spacecraft/.svn/text-base"
 #define FILE_DIR "code/game/verbs"
-#define FILE_DIR "code/game/verbs/.svn"
-#define FILE_DIR "code/game/verbs/.svn/text-base"
 #define FILE_DIR "code/modules"
-#define FILE_DIR "code/modules/.svn"
 #define FILE_DIR "code/modules/admin"
-#define FILE_DIR "code/modules/admin/.svn"
-#define FILE_DIR "code/modules/admin/.svn/text-base"
 #define FILE_DIR "code/modules/admin/verbs"
-#define FILE_DIR "code/modules/admin/verbs/.svn"
-#define FILE_DIR "code/modules/admin/verbs/.svn/text-base"
-#define FILE_DIR "code/modules/assembly"
-#define FILE_DIR "code/modules/assembly/.svn"
-#define FILE_DIR "code/modules/ban"
-#define FILE_DIR "code/modules/ban/.svn"
-#define FILE_DIR "code/modules/build"
-#define FILE_DIR "code/modules/build/.svn"
-#define FILE_DIR "code/modules/chemical"
-#define FILE_DIR "code/modules/chemical/.svn"
-#define FILE_DIR "code/modules/combat"
-#define FILE_DIR "code/modules/combat/.svn"
-#define FILE_DIR "code/modules/combat/guns"
-#define FILE_DIR "code/modules/combat/guns/.svn"
-#define FILE_DIR "code/modules/computer"
-#define FILE_DIR "code/modules/computer/.svn"
-#define FILE_DIR "code/modules/door"
-#define FILE_DIR "code/modules/door/.svn"
-#define FILE_DIR "code/modules/gas"
-#define FILE_DIR "code/modules/gas/.svn"
-#define FILE_DIR "code/modules/genetic"
-#define FILE_DIR "code/modules/genetic/.svn"
-#define FILE_DIR "code/modules/hud"
-#define FILE_DIR "code/modules/hud/.svn"
-#define FILE_DIR "code/modules/login"
-#define FILE_DIR "code/modules/login/.svn"
-#define FILE_DIR "code/modules/medical"
-#define FILE_DIR "code/modules/medical/.svn"
 #define FILE_DIR "code/modules/mob"
-#define FILE_DIR "code/modules/mob/.svn"
-#define FILE_DIR "code/modules/mob/.svn/text-base"
 #define FILE_DIR "code/modules/mob/dead"
-#define FILE_DIR "code/modules/mob/dead/.svn"
 #define FILE_DIR "code/modules/mob/dead/observer"
-#define FILE_DIR "code/modules/mob/dead/observer/.svn"
-#define FILE_DIR "code/modules/mob/dead/observer/.svn/text-base"
 #define FILE_DIR "code/modules/mob/living"
-#define FILE_DIR "code/modules/mob/living/.svn"
-#define FILE_DIR "code/modules/mob/living/.svn/text-base"
 #define FILE_DIR "code/modules/mob/living/carbon"
-#define FILE_DIR "code/modules/mob/living/carbon/.svn"
-#define FILE_DIR "code/modules/mob/living/carbon/.svn/text-base"
 #define FILE_DIR "code/modules/mob/living/carbon/alien"
-#define FILE_DIR "code/modules/mob/living/carbon/alien/.svn"
-#define FILE_DIR "code/modules/mob/living/carbon/alien/.svn/text-base"
 #define FILE_DIR "code/modules/mob/living/carbon/alien/humanoid"
-#define FILE_DIR "code/modules/mob/living/carbon/alien/humanoid/.svn"
-#define FILE_DIR "code/modules/mob/living/carbon/alien/humanoid/.svn/text-base"
 #define FILE_DIR "code/modules/mob/living/carbon/alien/larva"
-#define FILE_DIR "code/modules/mob/living/carbon/alien/larva/.svn"
-#define FILE_DIR "code/modules/mob/living/carbon/alien/larva/.svn/text-base"
 #define FILE_DIR "code/modules/mob/living/carbon/beast"
-#define FILE_DIR "code/modules/mob/living/carbon/beast/.svn"
-#define FILE_DIR "code/modules/mob/living/carbon/beast/.svn/text-base"
 #define FILE_DIR "code/modules/mob/living/carbon/human"
-#define FILE_DIR "code/modules/mob/living/carbon/human/.svn"
-#define FILE_DIR "code/modules/mob/living/carbon/human/.svn/text-base"
 #define FILE_DIR "code/modules/mob/living/carbon/monkey"
-#define FILE_DIR "code/modules/mob/living/carbon/monkey/.svn"
-#define FILE_DIR "code/modules/mob/living/carbon/monkey/.svn/text-base"
 #define FILE_DIR "code/modules/mob/living/silicon"
-#define FILE_DIR "code/modules/mob/living/silicon/.svn"
-#define FILE_DIR "code/modules/mob/living/silicon/.svn/text-base"
 #define FILE_DIR "code/modules/mob/living/silicon/ai"
-#define FILE_DIR "code/modules/mob/living/silicon/ai/.svn"
-#define FILE_DIR "code/modules/mob/living/silicon/ai/.svn/text-base"
 #define FILE_DIR "code/modules/mob/living/silicon/decoy"
-#define FILE_DIR "code/modules/mob/living/silicon/decoy/.svn"
-#define FILE_DIR "code/modules/mob/living/silicon/decoy/.svn/text-base"
 #define FILE_DIR "code/modules/mob/living/silicon/hivebot"
-#define FILE_DIR "code/modules/mob/living/silicon/hivebot/.svn"
-#define FILE_DIR "code/modules/mob/living/silicon/hivebot/.svn/text-base"
 #define FILE_DIR "code/modules/mob/living/silicon/robot"
-#define FILE_DIR "code/modules/mob/living/silicon/robot/.svn"
-#define FILE_DIR "code/modules/mob/living/silicon/robot/.svn/text-base"
 #define FILE_DIR "code/modules/mob/new_player"
-#define FILE_DIR "code/modules/mob/new_player/.svn"
-#define FILE_DIR "code/modules/mob/new_player/.svn/text-base"
 #define FILE_DIR "code/modules/power"
-#define FILE_DIR "code/modules/power/.svn"
-#define FILE_DIR "code/modules/power/.svn/text-base"
 #define FILE_DIR "code/modules/power/antimatter"
-#define FILE_DIR "code/modules/power/antimatter/.svn"
-#define FILE_DIR "code/modules/power/antimatter/.svn/text-base"
-#define FILE_DIR "code/modules/radio"
-#define FILE_DIR "code/modules/radio/.svn"
-#define FILE_DIR "code/modules/shuttle"
-#define FILE_DIR "code/modules/shuttle/.svn"
 #define FILE_DIR "code/unused"
-#define FILE_DIR "code/unused/.svn"
-#define FILE_DIR "code/unused/.svn/text-base"
-#define FILE_DIR "code/unused/game"
-#define FILE_DIR "code/unused/game/.svn"
-#define FILE_DIR "code/unused/game/verbs"
-#define FILE_DIR "code/unused/game/verbs/.svn"
-#define FILE_DIR "code/unused/modules"
-#define FILE_DIR "code/unused/modules/.svn"
-#define FILE_DIR "code/unused/modules/admin"
-#define FILE_DIR "code/unused/modules/admin/.svn"
 #define FILE_DIR "code/WorkInProgress"
-#define FILE_DIR "code/WorkInProgress/.svn"
-#define FILE_DIR "code/WorkInProgress/.svn/text-base"
 #define FILE_DIR "code/WorkInProgress/computer2"
-#define FILE_DIR "code/WorkInProgress/computer2/.svn"
-#define FILE_DIR "code/WorkInProgress/computer2/.svn/text-base"
 #define FILE_DIR "code/WorkInProgress/optics"
-#define FILE_DIR "code/WorkInProgress/optics/.svn"
-#define FILE_DIR "code/WorkInProgress/optics/.svn/text-base"
 #define FILE_DIR "code/WorkInProgress/pda2"
-#define FILE_DIR "code/WorkInProgress/pda2/.svn"
-#define FILE_DIR "code/WorkInProgress/pda2/.svn/text-base"
 #define FILE_DIR "code/WorkInProgress/recycling"
-#define FILE_DIR "code/WorkInProgress/recycling/.svn"
-#define FILE_DIR "code/WorkInProgress/recycling/.svn/text-base"
-#define FILE_DIR "config"
-#define FILE_DIR "config/.svn"
-#define FILE_DIR "config/.svn/text-base"
-#define FILE_DIR "config/names"
-#define FILE_DIR "config/names/.svn"
-#define FILE_DIR "config/names/.svn/text-base"
-#define FILE_DIR "data"
-#define FILE_DIR "data/.svn"
-#define FILE_DIR "data/.svn/text-base"
 #define FILE_DIR "icons"
-#define FILE_DIR "icons/.svn"
-#define FILE_DIR "icons/.svn/prop-base"
-#define FILE_DIR "icons/.svn/text-base"
 #define FILE_DIR "icons/effects"
-#define FILE_DIR "icons/effects/.svn"
-#define FILE_DIR "icons/effects/.svn/prop-base"
-#define FILE_DIR "icons/effects/.svn/text-base"
 #define FILE_DIR "icons/misc"
-#define FILE_DIR "icons/misc/.svn"
-#define FILE_DIR "icons/misc/.svn/prop-base"
-#define FILE_DIR "icons/misc/.svn/text-base"
 #define FILE_DIR "icons/mob"
-#define FILE_DIR "icons/mob/.svn"
-#define FILE_DIR "icons/mob/.svn/prop-base"
-#define FILE_DIR "icons/mob/.svn/text-base"
 #define FILE_DIR "icons/obj"
-#define FILE_DIR "icons/obj/.svn"
-#define FILE_DIR "icons/obj/.svn/prop-base"
-#define FILE_DIR "icons/obj/.svn/text-base"
 #define FILE_DIR "icons/obj/atmospherics"
-#define FILE_DIR "icons/obj/atmospherics/.svn"
-#define FILE_DIR "icons/obj/atmospherics/.svn/prop-base"
-#define FILE_DIR "icons/obj/atmospherics/.svn/text-base"
 #define FILE_DIR "icons/obj/clothing"
-#define FILE_DIR "icons/obj/clothing/.svn"
-#define FILE_DIR "icons/obj/clothing/.svn/prop-base"
-#define FILE_DIR "icons/obj/clothing/.svn/text-base"
 #define FILE_DIR "icons/obj/doors"
-#define FILE_DIR "icons/obj/doors/.svn"
-#define FILE_DIR "icons/obj/doors/.svn/prop-base"
-#define FILE_DIR "icons/obj/doors/.svn/text-base"
 #define FILE_DIR "icons/obj/machines"
-#define FILE_DIR "icons/obj/machines/.svn"
-#define FILE_DIR "icons/obj/machines/.svn/prop-base"
-#define FILE_DIR "icons/obj/machines/.svn/text-base"
 #define FILE_DIR "icons/obj/pipes"
-#define FILE_DIR "icons/obj/pipes/.svn"
-#define FILE_DIR "icons/obj/pipes/.svn/prop-base"
-#define FILE_DIR "icons/obj/pipes/.svn/text-base"
 #define FILE_DIR "icons/pda_icons"
-#define FILE_DIR "icons/pda_icons/.svn"
-#define FILE_DIR "icons/pda_icons/.svn/prop-base"
-#define FILE_DIR "icons/pda_icons/.svn/text-base"
-#define FILE_DIR "icons/PSD files"
-#define FILE_DIR "icons/PSD files/.svn"
-#define FILE_DIR "icons/PSD files/.svn/prop-base"
-#define FILE_DIR "icons/PSD files/.svn/text-base"
 #define FILE_DIR "icons/Testing"
-#define FILE_DIR "icons/Testing/.svn"
-#define FILE_DIR "icons/Testing/.svn/prop-base"
-#define FILE_DIR "icons/Testing/.svn/text-base"
 #define FILE_DIR "icons/turf"
-#define FILE_DIR "icons/turf/.svn"
-#define FILE_DIR "icons/turf/.svn/prop-base"
-#define FILE_DIR "icons/turf/.svn/text-base"
 #define FILE_DIR "interface"
-#define FILE_DIR "interface/.svn"
-#define FILE_DIR "interface/.svn/text-base"
 #define FILE_DIR "maps"
-#define FILE_DIR "maps/.svn"
-#define FILE_DIR "maps/.svn/prop-base"
-#define FILE_DIR "maps/.svn/text-base"
 #define FILE_DIR "maps/backup"
-#define FILE_DIR "maps/backup/.svn"
-#define FILE_DIR "maps/backup/.svn/text-base"
-#define FILE_DIR "music"
-#define FILE_DIR "music/.svn"
-#define FILE_DIR "music/.svn/text-base"
 #define FILE_DIR "sound"
-#define FILE_DIR "sound/.svn"
 #define FILE_DIR "sound/ambience"
-#define FILE_DIR "sound/ambience/.svn"
-#define FILE_DIR "sound/ambience/.svn/prop-base"
-#define FILE_DIR "sound/ambience/.svn/text-base"
 #define FILE_DIR "sound/announcer"
-#define FILE_DIR "sound/announcer/.svn"
-#define FILE_DIR "sound/announcer/.svn/prop-base"
-#define FILE_DIR "sound/announcer/.svn/text-base"
 #define FILE_DIR "sound/effects"
-#define FILE_DIR "sound/effects/.svn"
-#define FILE_DIR "sound/effects/.svn/prop-base"
-#define FILE_DIR "sound/effects/.svn/text-base"
 #define FILE_DIR "sound/items"
-#define FILE_DIR "sound/items/.svn"
-#define FILE_DIR "sound/items/.svn/prop-base"
-#define FILE_DIR "sound/items/.svn/text-base"
 #define FILE_DIR "sound/machines"
-#define FILE_DIR "sound/machines/.svn"
-#define FILE_DIR "sound/machines/.svn/prop-base"
-#define FILE_DIR "sound/machines/.svn/text-base"
 #define FILE_DIR "sound/misc"
-#define FILE_DIR "sound/misc/.svn"
-#define FILE_DIR "sound/misc/.svn/prop-base"
-#define FILE_DIR "sound/misc/.svn/text-base"
 #define FILE_DIR "sound/piano"
-#define FILE_DIR "sound/piano/.svn"
-#define FILE_DIR "sound/piano/.svn/prop-base"
-#define FILE_DIR "sound/piano/.svn/text-base"
 #define FILE_DIR "sound/voice"
-#define FILE_DIR "sound/voice/.svn"
-#define FILE_DIR "sound/voice/.svn/prop-base"
-#define FILE_DIR "sound/voice/.svn/text-base"
 #define FILE_DIR "sound/weapons"
-#define FILE_DIR "sound/weapons/.svn"
-#define FILE_DIR "sound/weapons/.svn/prop-base"
-#define FILE_DIR "sound/weapons/.svn/text-base"
-#define FILE_DIR "SQL"
-#define FILE_DIR "SQL/.svn"
-#define FILE_DIR "SQL/.svn/text-base"
 // END_FILE_DIR

 // BEGIN_PREFERENCES
@@ -508,6 +176,7 @@
 #include "code\datums\diseases\magnitis.dm"
 #include "code\datums\diseases\plasmatoid.dm"
 #include "code\datums\diseases\robotic_transformation.dm"
+#include "code\datums\diseases\wizarditis.dm"
 #include "code\datums\diseases\xeno_transformation.dm"
 #include "code\defines\atom.dm"
 #include "code\defines\client.dm"
@@ -525,6 +194,7 @@
 #include "code\defines\mob\living\carbon\alien_larva.dm"
 #include "code\defines\mob\living\carbon\carbon.dm"
 #include "code\defines\mob\living\carbon\human.dm"
+#include "code\defines\mob\living\carbon\metroid.dm"
 #include "code\defines\mob\living\carbon\monkey.dm"
 #include "code\defines\mob\living\silicon\ai.dm"
 #include "code\defines\mob\living\silicon\decoy.dm"
@@ -841,6 +511,7 @@
 #include "code\game\verbs\authorize.dm"
 #include "code\game\verbs\checkkarma.dm"
 #include "code\game\verbs\ooc.dm"
+#include "code\game\verbs\sound.dm"
 #include "code\game\verbs\suicide.dm"
 #include "code\game\verbs\who.dm"
 #include "code\modules\admin\admin.dm"
--- a/icons/obj/clothing/gloves.dmi
+++ b/icons/obj/clothing/gloves.dmi