Merge pull request #6856 from Baystation12/dev-freeze

Freeze - Dev

code/modules/mining/satchel_ore_boxdm.dm

@@ -95,4 +95,12 @@
 		O.loc = src.loc
 	usr << "\blue You empty the ore box"
 
-	return
+	return
+
+/obj/structure/ore_box/ex_act(severity)
+	if(severity == 1.0 || (severity < 3.0 && prob(50)))
+		for (var/obj/item/weapon/ore/O in contents)
+			O.loc = src.loc
+			O.ex_act(severity++)
+		del(src)
+		return

code/modules/power/turbine.dm

@@ -30,7 +30,7 @@
 	name = "Gas turbine control computer"
 	desc = "A computer to remotely control a gas turbine"
 	icon = 'icons/obj/computer.dmi'
-	icon_state = "airtunnel0e"
+	icon_state = "turbinecomp"
 	circuit = /obj/item/weapon/circuitboard/turbine_control
 	anchored = 1
 	density = 1