Merge branch 'master' of https://github.com/ParadiseSS13/Paradise

Conflicts:
	code/modules/power/port_gen.dm

code/game/objects/items/robot/robot_upgrades.dm

@@ -159,6 +159,50 @@
 		//R.icon_state="Miner+j"
 		return 1
 
+/obj/item/borg/upgrade/ddrill
+	name = "mining cyborg diamond drill"
+	desc = "A diamond drill replacement for the mining module's standard drill."
+	icon_state = "cyborg_upgrade3"
+	require_module = 1
+
+/obj/item/borg/upgrade/ddrill/action(var/mob/living/silicon/robot/R)
+	if(..()) return 0
+
+	if(!istype(R.module, /obj/item/weapon/robot_module/miner))
+		R << "Upgrade mounting error!  No suitable hardpoint detected!"
+		usr << "There's no mounting point for the module!"
+		return 0
+	else
+		for(var/obj/item/weapon/pickaxe/drill/cyborg/D in R.module.modules)
+			R.module.modules -= D
+			qdel(D)
+		for(var/obj/item/weapon/shovel/S in R.module.modules)
+			R.module.modules -= S
+			qdel(S)
+		R.module.modules += new /obj/item/weapon/pickaxe/drill/cyborg/diamond(R.module)
+		R.module.rebuild()
+		return 1
+
+/obj/item/borg/upgrade/soh
+	name = "mining cyborg satchel of holding"
+	desc = "A satchel of holding replacement for mining cyborg's ore satchel module."
+	icon_state = "cyborg_upgrade3"
+	require_module = 1
+
+/obj/item/borg/upgrade/soh/action(var/mob/living/silicon/robot/R)
+	if(..()) return 0
+
+	if(!istype(R.module, /obj/item/weapon/robot_module/miner))
+		R << "Upgrade mounting error!  No suitable hardpoint detected!"
+		usr << "There's no mounting point for the module!"
+		return 0
+	else
+		for(var/obj/item/weapon/storage/bag/ore/cyborg/S in R.module.modules)
+			R.module.modules -= S
+			qdel(S)
+		R.module.modules += new /obj/item/weapon/storage/bag/ore/holding/cyborg(R.module)
+		R.module.rebuild()
+		return 1
 
 /obj/item/borg/upgrade/syndicate/
 	name = "Illegal Equipment Module"

code/game/objects/items/stacks/sheets/mineral.dm

@@ -7,7 +7,7 @@ Mineral Sheets
 		- Plasma
 		- Gold
 		- Silver
-		- Clown
+		- Bananium
 		- Enriched Uranium
 		- Platinum
 		- Metallic Hydrogen
@@ -57,16 +57,11 @@ var/global/list/datum/stack_recipe/plastic_recipes = list ( \
 	new/datum/stack_recipe("sucker mould", /obj/item/weapon/kitchen/mould/loli, 1, on_floor = 1), \
 	)
 
-var/global/list/datum/stack_recipe/clown_recipes = list ( \
+var/global/list/datum/stack_recipe/bananium_recipes = list ( \
 	new/datum/stack_recipe("bananium computer frame", /obj/structure/computerframe/HONKputer, 50, time = 25, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("bananium grenade casing", /obj/item/weapon/grenade/bananade/casing, 4, on_floor = 1), \
 	)
 
-var/global/list/datum/stack_recipe/iron_recipes = list ( \
-	new/datum/stack_recipe("iron door", /obj/structure/mineral_door/iron, 20, one_per_turf = 1, on_floor = 1), \
-	null, \
-)
-
 /obj/item/stack/sheet/mineral
 	force = 5.0
 	throwforce = 5
@@ -79,18 +74,6 @@ var/global/list/datum/stack_recipe/iron_recipes = list ( \
 	pixel_x = rand(0,4)-4
 	pixel_y = rand(0,4)-4
 
-obj/item/stack/sheet/mineral/iron
-	name = "iron"
-	icon_state = "sheet-silver"
-	origin_tech = "materials=1"
-	sheettype = "iron"
-	color = "#333333"
-	perunit = 2000
-
-obj/item/stack/sheet/mineral/iron/New()
-	..()
-	recipes = iron_recipes
-
 /obj/item/stack/sheet/mineral/sandstone
 	name = "sandstone brick"
 	desc = "This appears to be a combination of both sand and stone."
@@ -176,52 +159,19 @@ obj/item/stack/sheet/mineral/iron/New()
 	..()
 	recipes = silver_recipes
 
-/obj/item/stack/sheet/mineral/clown
+/obj/item/stack/sheet/mineral/bananium
 	name = "bananium"
 	icon_state = "sheet-clown"
 	origin_tech = "materials=4"
 	perunit = 2000
 	sheettype = "clown"
 
-/obj/item/stack/sheet/mineral/clown/New(var/loc, var/amount=null)
+/obj/item/stack/sheet/mineral/bananium/New(var/loc, var/amount=null)
 	..()
-	recipes = clown_recipes
+	recipes = bananium_recipes
 
 /obj/item/stack/sheet/mineral/enruranium
 	name = "enriched uranium"
 	icon_state = "sheet-enruranium"
 	origin_tech = "materials=5"
 	perunit = 1000
-
-//Valuable resource, cargo can sell it.
-/obj/item/stack/sheet/mineral/platinum
-	name = "platinum"
-	icon_state = "sheet-adamantine"
-	origin_tech = "materials=2"
-	sheettype = "platinum"
-	perunit = 2000
-
-//Extremely valuable to Research.
-/obj/item/stack/sheet/mineral/mhydrogen
-	name = "metallic hydrogen"
-	icon_state = "sheet-mythril"
-	origin_tech = "materials=6;powerstorage=5;magnets=5"
-	sheettype = "mhydrogen"
-	perunit = 2000
-
-//Fuel for MRSPACMAN generator.
-/obj/item/stack/sheet/mineral/tritium
-	name = "tritium"
-	icon_state = "sheet-silver"
-	sheettype = "tritium"
-	origin_tech = "materials=5"
-	color = "#777777"
-	perunit = 2000
-
-/obj/item/stack/sheet/mineral/osmium
-	name = "osmium"
-	icon_state = "sheet-silver"
-	sheettype = "osmium"
-	origin_tech = "materials=5"
-	color = "#9999FF"
-	perunit = 2000

code/game/objects/items/weapons/grenades/clowngrenade.dm

@@ -11,9 +11,6 @@
 	var/path = 0
 	var/affected_area = 2
 
-	New()
-		icon_state = initial(icon_state) +"_locked"
-
 	prime()
 		..()
 		playsound(src.loc, 'sound/items/bikehorn.ogg', 25, -3)

code/game/objects/items/weapons/storage/bags.dm

@@ -117,7 +117,7 @@
 // -----------------------------
 
 /obj/item/weapon/storage/bag/ore
-	name = "Mining Satchel"
+	name = "mining satchel"
 	desc = "This little bugger can be used to store and transport ores."
 	icon = 'icons/obj/mining.dmi'
 	icon_state = "satchel"
@@ -128,6 +128,10 @@
 	max_w_class = 3
 	can_hold = list("/obj/item/weapon/ore")
 
+/obj/item/weapon/storage/bag/ore/cyborg
+	name = "cyborg mining satchel"
+	flags = NODROP
+
 /obj/item/weapon/storage/bag/ore/holding //miners, your messiah has arrived
 	name = "mining satchel of holding"
 	desc = "A revolution in convenience, this satchel allows for infinite ore storage. It's been outfitted with anti-malfunction safety measures."
@@ -136,6 +140,10 @@
 	origin_tech = "bluespace=3"
 	icon_state = "satchel_bspace"
 
+/obj/item/weapon/storage/bag/ore/holding/cyborg
+	name = "cyborg mining satchel of holding"
+	flags = NODROP
+
 // -----------------------------
 //          Plant bag
 // -----------------------------