- Some runtime-prevention tweaks so that impatient coders don't just break everything somewhere down the line.

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

code/defines/obj.dm

@@ -292,6 +292,20 @@
 //	causeerrorheresoifixthis
 	var/obj/item/master = null
 
+	//Since any item can now be a piece of clothing, this has to be put here so all items share it.
+	var/see_face = 1.0
+	var/color = null
+	var/body_parts_covered = 0 //see setup.dm for appropriate bit flags
+	var/protective_temperature = 0
+	var/heat_transfer_coefficient = 1 //0 prevents all transfers, 1 is invisible
+	var/gas_transfer_coefficient = 1 // for leaking gas from turf to mask and vice-versa (for masks right now, but at some point, i'd like to include space helmets)
+	var/permeability_coefficient = 1 // for chemicals/diseases
+	var/siemens_coefficient = 1 // for electrical admittance/conductance (electrocution checks and shit)
+	var/slowdown = 0 // How much clothing is slowing you down. Negative values speeds you up
+	var/canremove = 1 //Mostly for Ninja code at this point but basically will not allow the item to be removed if set to 0. /N
+	var/armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+	var/list/allowed = null //suit storage stuff.
+
 /obj/item/device
 	icon = 'device.dmi'
 

code/defines/obj/clothing.dm

@@ -4,20 +4,7 @@
 	name = "clothing"
 //	var/obj/item/clothing/master = null
 
-	var/see_face = 1.0
-	var/color = null
 
-	var/body_parts_covered = 0 //see setup.dm for appropriate bit flags
-
-	var/protective_temperature = 0
-	var/heat_transfer_coefficient = 1 //0 prevents all transfers, 1 is invisible
-	var/gas_transfer_coefficient = 1 // for leaking gas from turf to mask and vice-versa (for masks right now, but at some point, i'd like to include space helmets)
-	var/permeability_coefficient = 1 // for chemicals/diseases
-	var/siemens_coefficient = 1 // for electrical admittance/conductance (electrocution checks and shit)
-	var/slowdown = 0 // How much clothing is slowing you down. Negative values speeds you up
-	var/canremove = 1 //Mostly for Ninja code at this point but basically will not allow the item to be removed if set to 0. /N
-
-	var/armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 
 
 

code/defines/obj/clothing/head.dm

@@ -3,7 +3,6 @@
 	name = "head"
 	icon = 'hats.dmi'
 	body_parts_covered = HEAD
-	var/list/allowed = list()
 	slot_flags = SLOT_HEAD
 
 /obj/item/clothing/head/cakehat

code/defines/obj/weapon.dm

@@ -233,7 +233,7 @@
 	origin_tech = "combat=3"
 
 /obj/item/weapon/melee/energy/sword
-	var/color
+	color
 	name = "energy sword"
 	desc = "May the force be within you."
 	icon_state = "sword0"
@@ -323,7 +323,7 @@
 	w_class = 1.0
 	throw_speed = 2
 	throw_range = 10
-	var/color = "white"
+	color = "white"
 
 /obj/item/weapon/bedsheet/blue
 	icon_state = "sheetblue"
@@ -547,7 +547,7 @@
 	icon = 'power.dmi'
 	icon_state = "coil_red"
 	var/amount = MAXCOIL
-	var/color = "red"
+	color = "red"
 	desc = "A coil of power cable."
 	throwforce = 10
 	w_class = 2.0

code/game/objects/items/weapons/implants/implant.dm

@@ -1,15 +1,22 @@
 /obj/item/weapon/implant
 	name = "implant"
-	var
+	var/implanted = null
-		implanted = null
+	var/mob/imp_in = null
-		mob/imp_in = null
+	color = "b"
-		color = "b"
+	var/allow_reagents = 0
-		allow_reagents = 0
+
-	proc
+	proc/trigger(emote, source as mob)
-		trigger(emote, source as mob)
+		return
-		activate()
+
-		implanted(source as mob)
+	proc/activate()
-		get_data()
+		return
+
+	proc/implanted(source as mob)
+		return
+
+	proc/get_data()
+		return
+
 
 
 	trigger(emote, source as mob)
@@ -32,9 +39,8 @@
 /obj/item/weapon/implant/uplink
 	name = "uplink"
 	desc = "Summon things."
-	var
+	var/activation_emote = "chuckle"
-		activation_emote = "chuckle"
+	var/obj/item/device/uplink/radio/uplink = null
-		obj/item/device/uplink/radio/uplink = null
 
 
 	New()
@@ -61,8 +67,7 @@
 /obj/item/weapon/implant/tracking
 	name = "tracking"
 	desc = "Track with this."
-	var
+	var/id = 1.0
-		id = 1.0
 
 
 	get_data()

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

@@ -7,7 +7,7 @@ var/global/list/cached_icons = list()
 	desc = "Used to recolor floors and walls. Can not be removed by the janitor."
 	icon = 'items.dmi'
 	icon_state = "paint_neutral"
-	var/color = "FFFFFF"
+	color = "FFFFFF"
 	item_state = "paintcan"
 	w_class = 3.0
 

code/game/objects/radio/headset.dm

@@ -9,7 +9,7 @@
 	canhear_range = 1 // can't hear headsets from very far away
 
 	slot_flags = SLOT_EARS
-	var/protective_temperature = 0
+	protective_temperature = 0
 	var/translate_binary = 0
 	var/translate_hive = 0
 	var/obj/item/device/encryptionkey/keyslot1 = null

code/modules/clothing/suit.dm

@@ -3,6 +3,6 @@
 	name = "suit"
 	var/fire_resist = T0C+100
 	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
-	var/list/allowed = list(/obj/item/weapon/tank/emergency_oxygen)
+	allowed = list(/obj/item/weapon/tank/emergency_oxygen)
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 	slot_flags = SLOT_OCLOTHING

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

@@ -593,11 +593,12 @@
 
 	..()
 
-	if(M.gloves)
+	if(M.gloves && istype(M.gloves,/obj/item/clothing/gloves))
-		if(M.gloves.cell)
+		var/obj/item/clothing/gloves/G = M.gloves
+		if(G.cell)
 			if(M.a_intent == "hurt")//Stungloves. Any contact will stun the alien.
-				if(M.gloves.cell.charge >= 2500)
+				if(G.cell.charge >= 2500)
-					M.gloves.cell.charge -= 2500
+					G.cell.charge -= 2500
 
 					Weaken(5)
 					if (stuttering < 5)

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

@@ -365,11 +365,12 @@
 
 	..()
 
-	if(M.gloves)
+	if(M.gloves && istype(M.gloves,/obj/item/clothing/gloves))
-		if(M.gloves.cell)
+		var/obj/item/clothing/gloves/G = M.gloves
+		if(G.cell)
 			if(M.a_intent == "hurt")//Stungloves. Any contact will stun the alien.
-				if(M.gloves.cell.charge >= 2500)
+				if(G.cell.charge >= 2500)
-					M.gloves.cell.charge -= 2500
+					G.cell.charge -= 2500
 
 					Weaken(5)
 					if (stuttering < 5)

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

@@ -23,18 +23,18 @@
 	var/age = 30.0
 	var/b_type = "A+"
 
-	var/obj/item/clothing/suit/wear_suit = null
+	var/obj/item/wear_suit = null
-	var/obj/item/clothing/under/w_uniform = null
+	var/obj/item/w_uniform = null
-	var/obj/item/clothing/shoes/shoes = null
+	var/obj/item/shoes = null
-	var/obj/item/weapon/belt = null
+	var/obj/item/belt = null
-	var/obj/item/clothing/gloves/gloves = null
+	var/obj/item/gloves = null
-	var/obj/item/clothing/glasses/glasses = null
+	var/obj/item/glasses = null
-	var/obj/item/clothing/head/head = null
+	var/obj/item/head = null
-	var/obj/item/clothing/ears/ears = null
+	var/obj/item/ears = null
 	var/obj/item/weapon/card/id/wear_id = null
-	var/obj/item/weapon/r_store = null
+	var/obj/item/r_store = null
-	var/obj/item/weapon/l_store = null
+	var/obj/item/l_store = null
-	var/obj/item/weapon/s_store = null
+	var/obj/item/s_store = null
 
 	var/icon/stand_icon = null
 	var/icon/lying_icon = null

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

@@ -9,11 +9,13 @@
 		visible_message("\red <B>[M] attempted to touch [src]!</B>")
 		return 0
 
-	if(M.gloves)
+
-		if(M.gloves.cell)
+	if(M.gloves && istype(M.gloves,/obj/item/clothing/gloves))
-			if(M.a_intent == "hurt")
+		var/obj/item/clothing/gloves/G = M.gloves
-				if(M.gloves.cell.charge >= 2500)
+		if(G.cell)
-					M.gloves.cell.charge -= 2500
+			if(M.a_intent == "hurt")//Stungloves. Any contact will stun the alien.
+				if(G.cell.charge >= 2500)
+					G.cell.charge -= 2500
 					visible_message("\red <B>[src] has been touched with the stun gloves by [M]!</B>")
 					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>")

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

@@ -463,11 +463,13 @@
 
 
 
-	if(M.gloves)
+
-		if(M.gloves.cell)
+	if(M.gloves && istype(M.gloves,/obj/item/clothing/gloves))
+		var/obj/item/clothing/gloves/G = M.gloves
+		if(G.cell)
 			if(M.a_intent == "hurt")//Stungloves. Any contact will stun the alien.
-				if(M.gloves.cell.charge >= 2500)
+				if(G.cell.charge >= 2500)
-					M.gloves.cell.charge -= 2500
+					G.cell.charge -= 2500
 					for(var/mob/O in viewers(src, null))
 						if ((O.client && !( O.blinded )))
 							O.show_message("\red <B>[src] has been touched with the stun gloves by [M]!</B>", 1, "\red You hear someone fall.", 2)

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

@@ -157,11 +157,13 @@
 	if (istype(loc, /turf) && istype(loc.loc, /area/start))
 		M << "No attacking people at spawn, you jackass."
 		return
-	if(M.gloves)
+
-		if(M.gloves.cell)
+	if(M.gloves && istype(M.gloves,/obj/item/clothing/gloves))
-			if(M.a_intent == "hurt")
+		var/obj/item/clothing/gloves/G = M.gloves
-				if(M.gloves.cell.charge >= 2500)
+		if(G.cell)
-					M.gloves.cell.charge -= 2500
+			if(M.a_intent == "hurt")//Stungloves. Any contact will stun the alien.
+				if(G.cell.charge >= 2500)
+					G.cell.charge -= 2500
 					Weaken(5)
 					if (stuttering < 5)
 						stuttering = 5

code/modules/paperwork/paper.dm

@@ -10,15 +10,15 @@
 	layer = 4
 	pressure_resistance = 1
 	slot_flags = SLOT_HEAD
+	see_face = 1
+	body_parts_covered = HEAD
+	protective_temperature = 0
 
 	var/info	//What's actually written on the paper.
 	var/info_links //A different version of the paper which includes html links at fields and EOF
 	var/stamps	//The (text for the) stamps on the paper.
 	var/fields  //Amount of user created fields
 	var/list/stamped
-	var/see_face = 1
-	var/body_parts_covered = HEAD
-	var/protective_temperature = 0
 	var/rigged = 0
 	var/spam_flag = 0
 

code/modules/paperwork/stamps.dm

@@ -10,7 +10,7 @@
 	throw_speed = 7
 	throw_range = 15
 	m_amt = 60
-	var/color = "cargo"
+	color = "cargo"
 	pressure_resistance = 5
 
 /obj/item/weapon/stamp/captain