- 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/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()