Merge branch 'master' into upstream-merge-11110

code/modules/mining/drilling/drill.dm

@@ -1,8 +1,8 @@
 /obj/machinery/mining
 	icon = 'icons/obj/mining_drill.dmi'
-	anchored = 0
+	anchored = FALSE
 	use_power = USE_POWER_OFF //The drill takes power directly from a cell.
-	density = 1
+	density = TRUE
 	layer = MOB_LAYER+0.1 //So it draws over mobs in the tile north of it.
 
 /obj/machinery/mining/drill
@@ -266,10 +266,10 @@
 
 	if((!supports || !supports.len) && initial(anchored) == 0)
 		icon_state = "mining_drill"
-		anchored = 0
+		anchored = FALSE
 		active = 0
 	else
-		anchored = 1
+		anchored = TRUE
 
 	if(supports && supports.len >= braces_needed)
 		supported = 1

code/modules/mining/machinery/machine_input_output_plates.dm

@@ -4,8 +4,8 @@
 	icon = 'icons/mob/screen1.dmi'
 	icon_state = "x2"
 	name = "Input area"
-	density = 0
-	anchored = 1.0
+	density = FALSE
+	anchored = TRUE
 
 /obj/machinery/mineral/input/New()
 	icon_state = "blank"
@@ -14,8 +14,8 @@
 	icon = 'icons/mob/screen1.dmi'
 	icon_state = "x"
 	name = "Output area"
-	density = 0
-	anchored = 1.0
+	density = FALSE
+	anchored = TRUE
 
 /obj/machinery/mineral/output/New()
 	icon_state = "blank"

code/modules/mining/machinery/machine_stacking.dm

@@ -5,8 +5,8 @@
 	icon = 'icons/obj/machines/mining_machines_vr.dmi'  // VOREStation Edit
 	icon_state = "console"
 	layer = ABOVE_WINDOW_LAYER
-	density = 1
-	anchored = 1
+	density = TRUE
+	anchored = TRUE
 	var/obj/machinery/mineral/stacking_machine/machine = null
 	//var/machinedir = SOUTHEAST //This is really dumb, so lets burn it with fire.
 
@@ -77,8 +77,8 @@
 	name = "stacking machine"
 	icon = 'icons/obj/machines/mining_machines_vr.dmi' // VOREStation Edit
 	icon_state = "stacker"
-	density = 1
-	anchored = 1.0
+	density = TRUE
+	anchored = TRUE
 	var/obj/machinery/mineral/stacking_unit_console/console
 	var/obj/machinery/mineral/input = null
 	var/obj/machinery/mineral/output = null

code/modules/mining/machinery/machine_unloading.dm

@@ -5,8 +5,8 @@
 	name = "unloading machine"
 	icon = 'icons/obj/machines/mining_machines_vr.dmi' // VOREStation Edit
 	icon_state = "unloader"
-	density = 1
-	anchored = 1.0
+	density = TRUE
+	anchored = TRUE
 	var/obj/machinery/mineral/input = null
 	var/obj/machinery/mineral/output = null
 

code/modules/mining/mine_items.dm

@@ -26,7 +26,7 @@
 	attack_verb = list("hit", "pierced", "sliced", "attacked")
 	var/drill_sound = "pickaxe"
 	var/drill_verb = "drilling"
-	sharp = 1
+	sharp = TRUE
 
 	var/excavation_amount = 200
 	var/destroy_artefacts = FALSE // some mining tools will destroy artefacts completely while avoiding side-effects.
@@ -78,8 +78,8 @@
 	desc = "A rock cutter that uses bursts of hot plasma. You could use it to cut limbs off of xenos! Or, you know, mine stuff."
 	drill_verb = "cutting"
 	drill_sound = 'sound/items/Welder.ogg'
-	sharp = 1
-	edge = 1
+	sharp = TRUE
+	edge = TRUE
 
 /obj/item/weapon/pickaxe/diamond
 	name = "diamond pickaxe"
@@ -124,8 +124,8 @@
 	origin_tech = list(TECH_MATERIAL = 1, TECH_ENGINEERING = 1)
 	matter = list(MAT_STEEL = 50)
 	attack_verb = list("bashed", "bludgeoned", "thrashed", "whacked")
-	sharp = 0
-	edge = 1
+	sharp = FALSE
+	edge = TRUE
 	var/digspeed = 40
 
 /obj/item/weapon/shovel/spade
@@ -144,7 +144,7 @@
 	desc = "A mining car. This one doesn't work on rails, but has to be dragged."
 	name = "Mining car (not for rails)"
 	icon = 'icons/obj/closets/miningcar.dmi'
-	density = 1
+	density = TRUE
 
 // Flags.
 
@@ -193,7 +193,7 @@
 	if(upright)
 		upright = 0
 		icon_state = base_state
-		anchored = 0
+		anchored = FALSE
 		src.visible_message("<b>[user]</b> knocks down [src].")
 	else
 		..()

code/modules/mining/mine_outcrops.dm

@@ -2,10 +2,10 @@
 	name = "outcrop"
 	desc = "A boring rocky outcrop."
 	icon = 'icons/obj/outcrop.dmi'
-	density = 1
+	density = TRUE
 	throwpass = 1
-	climbable = 1
-	anchored = 1
+	climbable = TRUE
+	anchored = TRUE
 	icon_state = "outcrop"
 	var/mindrop = 5
 	var/upperdrop = 10

code/modules/mining/mine_turfs.dm

@@ -5,7 +5,7 @@ var/list/mining_overlay_cache = list()
 	name = "impassable rock"
 	icon = 'icons/turf/walls.dmi'
 	icon_state = "rock-dark"
-	density = 1
+	density = TRUE
 	opacity = 1 // YW edit. Stops all my unsimulated tiles from being seethrough.
 
 //YW add start
@@ -27,7 +27,7 @@ var/list/mining_overlay_cache = list()
 	oxygen = 0
 	nitrogen = 0
 	opacity = 1
-	density = 1
+	density = TRUE
 	blocks_air = 1
 	temperature = T0C
 
@@ -113,7 +113,7 @@ var/list/mining_overlay_cache = list()
 	name = "sand"
 	icon = 'icons/turf/flooring/asteroid.dmi'
 	icon_state = "asteroid"
-	density = 0
+	density = FALSE
 	opacity = 0
 	blocks_air = 0
 	can_build_into_floor = TRUE
@@ -145,7 +145,7 @@ var/list/mining_overlay_cache = list()
 /turf/simulated/mineral/proc/make_floor()
 	if(!density && !opacity)
 		return
-	density = 0
+	density = FALSE
 	opacity = 0
 	blocks_air = 0
 	can_build_into_floor = TRUE
@@ -154,7 +154,7 @@ var/list/mining_overlay_cache = list()
 /turf/simulated/mineral/proc/make_wall()
 	if(density && opacity)
 		return
-	density = 1
+	density = TRUE
 	opacity = 1
 	blocks_air = 1
 	can_build_into_floor = FALSE

code/modules/mining/mineral_effect.dm

@@ -3,8 +3,8 @@
 	icon = 'icons/obj/mining.dmi'
 	desc = "Shiny."
 	mouse_opacity = 0
-	density = 0
-	anchored = 1
+	density = FALSE
+	anchored = TRUE
 	var/ore_key
 	var/image/scanner_image
 	var/ore_reagent	// Reagent from pumping water near this ore.

code/modules/mining/ore_box.dm

@@ -5,7 +5,7 @@
 	icon_state = "orebox0"
 	name = "ore box"
 	desc = "A heavy box used for storing ore."
-	density = 1
+	density = TRUE
 	var/last_update = 0
 	var/list/stored_ore = list()