- Standardized var definition for RND and radio code (possibly some other stuff)

- Removed all cases (that I saw anyway) of flags being defined by static numbers.

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

code/defines/obj.dm

@@ -359,7 +359,7 @@
 	density = 0
 	anchored = 1.0
 	layer = 2.3 //under pipes
-	//	flags = 64.0
+	//	flags = CONDUCT
 
 /obj/structure/lattice/New()
 	..()

code/defines/obj/weapon.dm

@@ -629,7 +629,7 @@
 	name = "dummy"
 	invisibility = 101.0
 	anchored = 1.0
-	flags = 2.0
+	flags = TABLEPASS
 
 /obj/item/weapon/extinguisher
 	name = "fire extinguisher"
@@ -734,7 +734,7 @@
 	throwforce = 5
 	w_class = 2.0
 	throw_speed = 3
-	throw_range = 5
+	throw_range = 5W
 	m_amt = 10000
 	origin_tech = "magnets=1;bluespace=3"
 

code/game/objects/effect_system.dm

@@ -18,7 +18,7 @@ would spawn and follow the beaker, even if it is carried or thrown.
 	icon = 'effects.dmi'
 	icon_state = "extinguish"
 	var/life = 15.0
-	flags = 2.0
+	flags = TABLEPASS
 	mouse_opacity = 0
 
 /obj/effect/effect/smoke

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

@@ -42,7 +42,8 @@
 	icon_state = "camera"
 	item_state = "electropack"
 	w_class = 2.0
-	flags = 466.0
+	flags = FPRINT | CONDUCT | USEDELAY | TABLEPASS | ONBELT
+	slot_flags = SLOT_BELT
 	m_amt = 2000
 	throwforce = 5
 	throw_speed = 4

code/game/objects/radio/electropack.dm

@@ -8,7 +8,8 @@
 	m_amt = 10000
 	frequency = 1449
 	w_class = 5.0
-	flags = 323
+	flags = FPRINT | CONDUCT | TABLEPASS
+	slot_flags = SLOT_BACK
 	item_state = "electropack"
 
 /obj/item/device/radio/electropack/examine()

code/game/objects/radio/radio.dm

@@ -9,46 +9,44 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
 	suffix = "\[3\]"
 	icon_state = "walkietalkie"
 	item_state = "walkietalkie"
-	var
-		on = 1 // 0 for off
-		last_transmission
-		frequency = 1459 //common chat
-		traitor_frequency = 0 //tune to frequency to unlock traitor supplies
-		canhear_range = 3 // the range which mobs can hear this radio from
-		obj/item/device/radio/patch_link = null
-		obj/item/device/uplink/traitorradio = null
-		wires = WIRE_SIGNAL | WIRE_RECEIVE | WIRE_TRANSMIT
-		b_stat = 0
-		broadcasting = 0
-		listening = 1
-		freerange = 0 // 0 - Sanitize frequencies, 1 - Full range
-		list/channels = list() //see communications.dm for full list. First channes is a "default" for :h
-		subspace_transmission = 0
+	var/on = 1 // 0 for off
+	var/last_transmission
+	var/frequency = 1459 //common chat
+	var/traitor_frequency = 0 //tune to frequency to unlock traitor supplies
+	var/canhear_range = 3 // the range which mobs can hear this radio from
+	var/obj/item/device/radio/patch_link = null
+	var/obj/item/device/uplink/traitorradio = null
+	var/wires = WIRE_SIGNAL | WIRE_RECEIVE | WIRE_TRANSMIT
+	var/b_stat = 0
+	var/broadcasting = 0
+	var/listening = 1
+	var/freerange = 0 // 0 - Sanitize frequencies, 1 - Full range
+	var/list/channels = list() //see communications.dm for full list. First channes is a "default" for :h
+	var/subspace_transmission = 0
 //			"Example" = FREQ_LISTENING|FREQ_BROADCASTING
-	flags = 450		// hello i'm a fucking idiot why is this 450?? CODE GODS PLEASE EXPLAIN~
+	flags = FPRINT | CONDUCT | TABLEPASS
+	slot_flags = SLOT_BELT
 	throw_speed = 2
 	throw_range = 9
 	w_class = 2
 	g_amt = 25
 	m_amt = 75
-	var/const
-		WIRE_SIGNAL = 1 //sends a signal, like to set off a bomb or electrocute someone
-		WIRE_RECEIVE = 2
-		WIRE_TRANSMIT = 4
-		TRANSMISSION_DELAY = 5 // only 2/second/radio
-		FREQ_LISTENING = 1
+	var/const/WIRE_SIGNAL = 1 //sends a signal, like to set off a bomb or electrocute someone
+	var/const/WIRE_RECEIVE = 2
+	var/const/WIRE_TRANSMIT = 4
+	var/const/TRANSMISSION_DELAY = 5 // only 2/second/radio
+	var/const/FREQ_LISTENING = 1
 		//FREQ_BROADCASTING = 2
 
 
 /obj/item/device/radio
-	var
-		datum/radio_frequency/radio_connection
-		list/datum/radio_frequency/secure_radio_connections = new
-	proc
-		set_frequency(new_frequency)
-			radio_controller.remove_object(src, frequency)
-			frequency = new_frequency
-			radio_connection = radio_controller.add_object(src, frequency, RADIO_CHAT)
+	var/datum/radio_frequency/radio_connection
+	var/list/datum/radio_frequency/secure_radio_connections = new
+
+	proc/set_frequency(new_frequency)
+		radio_controller.remove_object(src, frequency)
+		frequency = new_frequency
+		radio_connection = radio_controller.add_object(src, frequency, RADIO_CHAT)
 
 
 

code/modules/assembly/assembly.dm

@@ -46,31 +46,43 @@
 	throw_range = 10
 	origin_tech = "magnets=1"
 
-	var
-		secured = 1
-		small_icon_state_left = null
-		small_icon_state_right = null
-		list/small_icon_state_overlays = null
-		obj/item/device/assembly_holder/holder = null
-		cooldown = 0//To prevent spam
-		wires = WIRE_RECEIVE | WIRE_PULSE
+	var/secured = 1
+	var/small_icon_state_left = null
+	var/small_icon_state_right = null
+	var/list/small_icon_state_overlays = null
+	var/obj/item/device/assembly_holder/holder = null
+	var/cooldown = 0//To prevent spam
+	var/wires = WIRE_RECEIVE | WIRE_PULSE
 
-	var/const
-		WIRE_RECEIVE = 1			//Allows Pulsed(0) to call Activate()
-		WIRE_PULSE = 2				//Allows Pulse(0) to act on the holder
-		WIRE_PULSE_SPECIAL = 4		//Allows Pulse(0) to act on the holders special assembly
-		WIRE_RADIO_RECEIVE = 8		//Allows Pulsed(1) to call Activate()
-		WIRE_RADIO_PULSE = 16		//Allows Pulse(1) to send a radio message
+	var/const/WIRE_RECEIVE = 1			//Allows Pulsed(0) to call Activate()
+	var/const/WIRE_PULSE = 2				//Allows Pulse(0) to act on the holder
+	var/const/WIRE_PULSE_SPECIAL = 4		//Allows Pulse(0) to act on the holders special assembly
+	var/const/WIRE_RADIO_RECEIVE = 8		//Allows Pulsed(1) to call Activate()
+	var/const/WIRE_RADIO_PULSE = 16		//Allows Pulse(1) to send a radio message
 
-	proc
-		activate()									//What the device does when turned on
-		pulsed(var/radio = 0)						//Called when another assembly acts on this one, var/radio will determine where it came from for wire calcs
-		pulse(var/radio = 0)						//Called when this device attempts to act on another device, var/radio determines if it was sent via radio or direct
-		toggle_secure()								//Code that has to happen when the assembly is un\secured goes here
-		attach_assembly(var/obj/A, var/mob/user)	//Called when an assembly is attacked by another
-		process_cooldown()							//Called via spawn(10) to have it count down the cooldown var
-		holder_movement()							//Called when the holder is moved
-		interact(mob/user as mob)					//Called when attack_self is called
+	proc/activate()									//What the device does when turned on
+		return
+
+	proc/pulsed(var/radio = 0)						//Called when another assembly acts on this one, var/radio will determine where it came from for wire calcs
+		return
+
+	proc/pulse(var/radio = 0)						//Called when this device attempts to act on another device, var/radio determines if it was sent via radio or direct
+		return
+
+	proc/toggle_secure()								//Code that has to happen when the assembly is un\secured goes here
+		return
+
+	proc/attach_assembly(var/obj/A, var/mob/user)	//Called when an assembly is attacked by another
+		return
+
+	proc/process_cooldown()							//Called via spawn(10) to have it count down the cooldown var
+		return
+
+	proc/holder_movement()							//Called when the holder is moved
+		return
+
+	proc/interact(mob/user as mob)					//Called when attack_self is called
+		return
 
 
 	process_cooldown()

code/modules/assembly/holder.dm

@@ -11,16 +11,20 @@
 	throw_speed = 3
 	throw_range = 10
 
-	var
-		secured = 0
-		obj/item/device/assembly/a_left = null
-		obj/item/device/assembly/a_right = null
-		obj/special_assembly = null
+	var/secured = 0
+	varobj/item/device/assembly/a_left = null
+	varobj/item/device/assembly/a_right = null
+	varobj/special_assembly = null
+
+	proc/attach(var/obj/item/device/D, var/obj/item/device/D2, var/mob/user)
+		return
+
+	proc/attach_special(var/obj/O, var/mob/user)
+		return
+
+	proc/process_activation(var/obj/item/device/D)
+		return
 
-	proc
-		attach(var/obj/item/device/D, var/obj/item/device/D2, var/mob/user)
-		attach_special(var/obj/O, var/mob/user)
-		process_activation(var/obj/item/device/D)
 
 
 	IsAssemblyHolder()

code/modules/mob/living/blob/blob.dm

@@ -6,9 +6,8 @@
 	pass_flags = PASSBLOB
 	see_in_dark = 8
 	see_invisible = 2
-	var
-		ghost_name = "Unknown"
-		creating_blob = 0
+	var/ghost_name = "Unknown"
+	var/creating_blob = 0
 
 
 	New()

code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -5,10 +5,10 @@
 	w_class = 100.0
 	item_state = "electronic"
 	flags = FPRINT|TABLEPASS | CONDUCT
-	var
-		list/modules = list()
-		obj/item/emag = null
-		obj/item/borg/upgrade/jetpack = null
+
+	var/list/modules = list()
+	var/obj/item/emag = null
+	var/obj/item/borg/upgrade/jetpack = null
 
 
 	emp_act(severity)

code/modules/power/antimatter/engine.dm

@@ -2,7 +2,7 @@
 	icon = 'AM_Engine.dmi'
 	density = 1
 	anchored = 1.0
-	flags = 512.0
+	flags = ON_BORDER
 
 /obj/machinery/power/am_engine/bits
 	name = "Antimatter Engine"

code/modules/research/circuitprinter.dm

@@ -8,11 +8,11 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
 	name = "Circuit Imprinter"
 	icon_state = "circuit_imprinter"
 	flags = OPENCONTAINER
-	var
-		g_amount = 0
-		gold_amount = 0
-		diamond_amount = 0
-		max_material_amount = 75000.0
+
+	var/g_amount = 0
+	var/gold_amount = 0
+	var/diamond_amount = 0
+	var/max_material_amount = 75000.0
 
 	New()
 		..()

code/modules/research/protolathe.dm

@@ -11,17 +11,17 @@ Note: Must be placed west/left of and R&D console to function.
 	name = "Protolathe"
 	icon_state = "protolathe"
 	flags = OPENCONTAINER
-	var
-		max_material_storage = 100000 //All this could probably be done better with a list but meh.
-		m_amount = 0.0
-		g_amount = 0.0
-		gold_amount = 0.0
-		silver_amount = 0.0
-		plasma_amount = 0.0
-		uranium_amount = 0.0
-		diamond_amount = 0.0
-		clown_amount = 0.0
-		adamantine_amount = 0.0
+
+	var/max_material_storage = 100000 //All this could probably be done better with a list but meh.
+	var/m_amount = 0.0
+	var/g_amount = 0.0
+	var/gold_amount = 0.0
+	var/silver_amount = 0.0
+	var/plasma_amount = 0.0
+	var/uranium_amount = 0.0
+	var/diamond_amount = 0.0
+	var/clown_amount = 0.0
+	var/adamantine_amount = 0.0
 
 
 	New()