Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cosmetic_things

# Conflicts:
#	icons/mob/back.dmi
#	icons/mob/items/lefthand.dmi
#	icons/mob/items/righthand.dmi

code/datums/autolathe/engineering.dm

@@ -74,6 +74,10 @@
 	name = "request console electronics"
 	path =/obj/item/weapon/circuitboard/request
 
+/datum/category_item/autolathe/engineering/pipelayer
+	name = "pipe layer electronics"
+	path =/obj/item/weapon/circuitboard/pipelayer
+
 /datum/category_item/autolathe/engineering/motor
 	name = "motor"
 	path =/obj/item/weapon/stock_parts/motor

code/datums/supplypacks/costumes.dm

@@ -78,7 +78,7 @@
 			/obj/item/clothing/under/scratch,
 			/obj/item/clothing/under/wedding/bride_white,
 			/obj/item/clothing/suit/chef,
-			/obj/item/clothing/suit/apron/overalls,
+			/obj/item/clothing/suit/storage/apron/overalls,
 			/obj/item/clothing/under/redcoat,
 			/obj/item/clothing/under/kilt
 			)

code/datums/supplypacks/hydroponics.dm

@@ -51,7 +51,7 @@
 			/obj/item/weapon/material/minihoe,
 			/obj/item/device/analyzer/plant_analyzer,
 			/obj/item/clothing/gloves/botanic_leather,
-			/obj/item/clothing/suit/apron,
+			/obj/item/clothing/suit/storage/apron,
 			/obj/item/weapon/material/minihoe,
 			/obj/item/weapon/storage/box/botanydisk
 			)

code/datums/uplink/tools.dm

@@ -58,11 +58,6 @@
 	item_cost = 15
 	path = /obj/item/device/encryptionkey/binary
 
-/datum/uplink_item/item/tools/packagebomb
-	name = "Package Bomb (Small)"
-	item_cost = 20
-	path = /obj/item/weapon/storage/box/syndie_kit/demolitions
-
 /datum/uplink_item/item/tools/hacking_tool
 	name = "Door Hacking Tool"
 	item_cost = 20
@@ -81,6 +76,11 @@
 	item_cost = 30
 	path = /obj/item/clothing/glasses/thermal/syndi
 
+/datum/uplink_item/item/tools/packagebomb
+	name = "Package Bomb (Small)"
+	item_cost = 30
+	path = /obj/item/weapon/storage/box/syndie_kit/demolitions
+
 /datum/uplink_item/item/tools/powersink
 	name = "Powersink (DANGER!)"
 	item_cost = 40
@@ -88,13 +88,13 @@
 
 /datum/uplink_item/item/tools/packagebomb/large
 	name = "Package Bomb (Large)"
-	item_cost = 40
+	item_cost = 60
 	path = /obj/item/weapon/storage/box/syndie_kit/demolitions_heavy
 
 /*
 /datum/uplink_item/item/tools/packagebomb/huge
 	name = "Package Bomb (Huge)
-	item_cost = 60
+	item_cost = 100
 	path = /obj/item/weapon/storage/box/syndie_kit/demolitions_super_heavy
 */