Merge pull request #6772 from VOREStation/aro-blufo

Various minor things

code/modules/mining/shelter_atoms_vr.dm

@@ -0,0 +1,13 @@
+/obj/structure/fans/hardlight
+	name = "hardlight shield"
+	desc = "Retains air, allows passage."
+	plane = TURF_PLANE
+	layer = ABOVE_TURF_LAYER
+	density = FALSE
+	icon = 'icons/effects/effects_vr.dmi'
+	icon_state = "hardlight"
+	buildstackamount = 2
+
+	light_range = 3
+	light_power = 1
+	light_color = "#FFFFFF"

code/modules/power/powernet.dm

@@ -148,8 +148,8 @@
 // return a knot cable (O-X) if one is present in the turf
 // null if there's none
 /turf/proc/get_cable_node()
-	if(!istype(src, /turf/simulated/floor))
-		return null
+	//if(!istype(src, /turf/simulated/floor)) //VOREStation Removal - Why?
+		//return null //VOREStation Removal - Why?
 	for(var/obj/structure/cable/C in src)
 		if(C.d1 == 0)
 			return C

code/modules/power/smes.dm

@@ -94,22 +94,22 @@
 	return 0
 
 /obj/machinery/power/smes/update_icon()
-	overlays.Cut()
+	cut_overlays()
 	if(stat & BROKEN)	return
 
-	overlays += image('icons/obj/power.dmi', "smes-op[outputting]")
+	add_overlay("smes-op[outputting]")
 
 	if(inputting == 2)
-		overlays += image('icons/obj/power.dmi', "smes-oc2")
+		add_overlay("smes-oc2")
 	else if (inputting == 1)
-		overlays += image('icons/obj/power.dmi', "smes-oc1")
+		add_overlay("smes-oc1")
 	else
 		if(input_attempt)
-			overlays += image('icons/obj/power.dmi', "smes-oc0")
+			add_overlay("smes-oc0")
 
 	var/clevel = chargedisplay()
 	if(clevel>0)
-		overlays += image('icons/obj/power.dmi', "smes-og[clevel]")
+		add_overlay("smes-og[clevel]")
 	return
 
 

code/modules/power/smes_vr.dm

@@ -0,0 +1,34 @@
+/obj/machinery/power/smes/buildable/hybrid
+	name = "hybrid power storage unit"
+	desc = "A high-capacity superconducting magnetic energy storage (SMES) unit, modified with alien technology to generate small amounts of power from seemingly nowhere."
+	icon = 'icons/obj/power_vr.dmi'
+	var/recharge_rate = 10000
+	var/overlay_icon = 'icons/obj/power_vr.dmi'
+
+/obj/machinery/power/smes/buildable/hybrid/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+	if(W.is_screwdriver() || W.is_wirecutter())
+		to_chat(user,"<span class='warning'>\The [src] full of weird alien technology that's best not messed with.</span>")
+		return 0
+
+/obj/machinery/power/smes/buildable/hybrid/update_icon()
+	cut_overlays()
+	if(stat & BROKEN)	return
+
+	add_overlay("smes-op[outputting]")
+
+	if(inputting == 2)
+		add_overlay("smes-oc2")
+	else if (inputting == 1)
+		add_overlay("smes-oc1")
+	else
+		if(input_attempt)
+			add_overlay("smes-oc0")
+
+	var/clevel = chargedisplay()
+	if(clevel>0)
+		add_overlay("smes-og[clevel]")
+	return
+
+/obj/machinery/power/smes/buildable/hybrid/process()
+	charge += min(recharge_rate, capacity - charge)
+	..()

code/modules/tables/presets_vr.dm

@@ -16,4 +16,6 @@
 
 /obj/structure/table/darkglass/dismantle(obj/item/weapon/wrench/W, mob/user)
 	to_chat(user, "<span class='warning'>You cannot dismantle \the [src].</span>")
-	return
+	return
+/obj/structure/table/alien/blue
+	icon = 'icons/turf/shuttle_alien_blue.dmi'