About to start work on gun swapper #checkpoint

scripts/player.gd

@@ -73,11 +73,16 @@ func _ready():
 	start_sensitivity = SENSITIVITY
 	
 	#Set up gun variables
+	var instance_gun = level_control.gun_1.instantiate()
+	instance_gun.global_transform.origin = weapon_spawner.position
+	gun = instance_gun
 	def_weapon_holder_pos = weapon_holder.position
 	ammo = gun.max_ammo
 	ammo_reserve = gun.max_ammo * gun.start_mags
 	bullet_damage = gun.bullet_damage
 	gun_fire_pitch_starting = gun.audio_fire.pitch_scale
+	weapon_holder.add_child(instance_gun)
+	
 	
 	#turn off audio if unchecked in player
 	if AUDIO == false:
@@ -254,6 +259,7 @@ func _on_pick_up_detection_body_entered(body):
 
 func _on_pick_up_magnet_body_entered(body):
 	if body.is_in_group("pickup"):
+		body.collision_shape.disabled = true
 		var pickup_direction = self.global_position - body.global_position
 		body.linear_velocity += pickup_direction * 5