Compile errors round 2 by Alberyk (#3)

code/datums/uplink/highly visible and dangerous weapons.dm

@@ -43,7 +43,7 @@
 /datum/uplink_item/item/visible_weapons/assaultrifle
 	name = "Assault Rifle"
 	item_cost = 14
-	path = /obj/item/weapon/gun/projectile/automatic/sts35
+	path = /obj/item/weapon/gun/projectile/automatic/rifle/sts35
 
 /datum/uplink_item/item/visible_weapons/heavysniper
 	name = "Anti-materiel Rifle"

code/game/objects/items/weapons/material/swords.dm

@@ -13,7 +13,7 @@
 	hitsound = 'sound/weapons/bladeslice.ogg'
 
 /obj/item/weapon/material/sword/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
-	
+
 	if(default_parry_check(user, attacker, damage_source) && prob(50))
 		user.visible_message("<span class='danger'>\The [user] parries [attack_text] with \the [src]!</span>")
 		playsound(user.loc, 'sound/weapons/punchmiss.ogg', 50, 1)
@@ -41,7 +41,7 @@
 	icon_state = "longsword"
 	item_state = "claymore"
 	slot_flags = SLOT_BELT | SLOT_BACK
-	
+
 /obj/item/weapon/material/sword/trench
 	name = "trench knife"
 	desc = "A military knife used to slash and stab enemies in close quarters."
@@ -49,9 +49,8 @@
 	icon_state = "trench"
 	item_state = "knife"
 	w_class = 3
-	flags = NOSHIELD
 	slot_flags = SLOT_BELT
-	
+
 /obj/item/weapon/material/sword/sabre
 	name = "sabre"
 	desc = "A sharp curved backsword."

code/game/objects/items/weapons/melee/energy.dm

@@ -62,7 +62,7 @@
 	throw_speed = 5
 	throw_range = 10
 	w_class = 5
-	flags = CONDUCT | NOSHIELD | NOBLOODY
+	flags = CONDUCT | NOBLOODY
 	origin_tech = "magnets=3;combat=4;syndicate=4"
 	attack_verb = list("stabbed", "chopped", "sliced", "cleaved", "slashed", "cut")
 	sharp = 1

code/modules/intern/intern.dm

@@ -67,7 +67,7 @@
 			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_tox(H), slot_back)
 			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
 		return 1
-		
+
 /datum/job/intern_eng
 	title = "Engineering Apprentice"
 	flag = INTERN_ENG
@@ -88,6 +88,6 @@
 			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
 		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/engineer(H), slot_w_uniform)
 		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(H), slot_shoes)
-		H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/eng(H), slot_head)
+		H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/engineering(H), slot_head)
 		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_eng(H), slot_l_ear)
 		return 1

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

@@ -285,7 +285,6 @@
 	icon = 'icons/obj/tank.dmi'
 	icon_state = "jetpack-black"
 	icon_state_broken = "jetpack-black"
-	construction_cost = list(DEFAULT_WALL_MATERIAL=10000,"phoron"=15000,"uranium" = 20000)
 
 /obj/item/robot_parts/robot_component/radio
 	name = "radio"

code/modules/projectiles/ammunition/boxes.dm

@@ -205,19 +205,6 @@
 	max_ammo = 20
 	multiple_sprites = 1
 
-/obj/item/ammo_magazine/chameleon
-	name = "magazine (.45)"
-	icon_state = "45"
-	mag_type = MAGAZINE
-	caliber = ".45"
-	ammo_type = /obj/item/ammo_casing/chameleon
-	max_ammo = 7
-	multiple_sprites = 1
-	matter = list()
-
-/obj/item/ammo_magazine/chameleon/empty
-	initial_ammo = 0
-
 /obj/item/ammo_magazine/boltaction
 	name = "ammo clip (7.62mm)"
 	icon_state = "762"

code/modules/random_map/drop/drop_types.dm

@@ -49,7 +49,7 @@ var/global/list/datum/supply_drop_loot/supply_drop
 		/obj/item/weapon/gun/projectile/shotgun/doublebarrel,
 		/obj/item/weapon/gun/projectile/shotgun/pump/combat,
 		/obj/item/weapon/gun/projectile/automatic/wt550,
-		/obj/item/weapon/gun/projectile/automatic/z8)
+		/obj/item/weapon/gun/projectile/automatic/rifle/z8)
 
 /datum/supply_drop_loot/ballistics
 	name = "Ballistics"
@@ -61,7 +61,7 @@ var/global/list/datum/supply_drop_loot/supply_drop
 		/obj/item/weapon/gun/projectile/shotgun/doublebarrel,
 		/obj/item/weapon/gun/projectile/shotgun/pump/combat,
 		/obj/item/weapon/gun/projectile/automatic/wt550,
-		/obj/item/weapon/gun/projectile/automatic/z8)
+		/obj/item/weapon/gun/projectile/automatic/rifle/z8)
 
 /datum/supply_drop_loot/seeds
 	name = "Seeds"

code/modules/research/mechfab_designs.dm

@@ -366,13 +366,13 @@
 	desc = "A carbon dioxide jetpack suitable for low-gravity mining operations."
 	id = "borg_jetpack_module"
 	materials = list(DEFAULT_WALL_MATERIAL = 10000, "phoron" = 15000, "uranium" = 20000)
-	build_path = /obj/item/borg/upgrade/jetpack
+	build_path = /obj/item/robot_parts/robot_component/jetpack
 
 /datum/design/item/robot_upgrade/rcd
 	name = "RCD module"
 	desc = "A rapid construction device module for use during construction operations."
 	id = "borg_rcd_module"
-	materials = list(DEFAULT_WALL_MATERIAL = 25000, "phoron" = 10000, "gold" = 1000, "silver" = 1000)
+	materials = list(DEFAULT_WALL_MATERIAL = 25000, "phoron" = 15000, "uranium" = 20000)
 	build_path = /obj/item/borg/upgrade/rcd
 
 /datum/design/item/robot_upgrade/syndicate