Code Readability - Objects (misc) (#18276)

* objects misc

* requested changes

code/game/objects/items.dm

@@ -70,7 +70,7 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons
 	var/list/allowed = null //suit storage stuff.
 	var/obj/item/uplink/hidden/hidden_uplink = null // All items can have an uplink hidden inside, just remember to add the triggers.
 
-	var/needs_permit = 0			//Used by security bots to determine if this item is safe for public use.
+	var/needs_permit = FALSE			//Used by security bots to determine if this item is safe for public use.
 
 	var/strip_delay = DEFAULT_ITEM_STRIP_DELAY
 	var/put_on_delay = DEFAULT_ITEM_PUTON_DELAY

code/game/objects/items/ashtray.dm

@@ -20,12 +20,12 @@
 
 		if(istype(I, /obj/item/clothing/mask/cigarette))
 			var/obj/item/clothing/mask/cigarette/cig = I
-			if(cig.lit == 1)
+			if(cig.lit)
 				visible_message("[user] crushes [cig] in [src], putting it out.")
 				var/obj/item/butt = new cig.type_butt(src)
 				cig.transfer_fingerprints_to(butt)
 				qdel(cig)
-			else if(cig.lit == 0)
+			else
 				to_chat(user, "You place [cig] in [src] without even smoking it. Why would you do that?")
 
 		visible_message("[user] places [I] in [src].")

code/game/objects/items/bodybag.dm

@@ -49,7 +49,7 @@
 
 /obj/structure/closet/body_bag/close()
 	if(..())
-		density = 0
+		density = FALSE
 		return TRUE
 	return FALSE
 

code/game/objects/items/candle.dm

@@ -6,9 +6,9 @@
 	item_state = "candle1"
 	w_class = WEIGHT_CLASS_TINY
 	var/wax = 200
-	var/lit = 0
-	var/infinite = 0
-	var/start_lit = 0
+	var/lit = FALSE
+	var/infinite = FALSE
+	var/start_lit = FALSE
 	var/flickering = FALSE
 	light_color = "#E09D37"
 
@@ -53,7 +53,7 @@
 
 /obj/item/candle/proc/light(show_message)
 	if(!lit)
-		lit = 1
+		lit = TRUE
 		if(show_message)
 			usr.visible_message(show_message)
 		set_light(CANDLE_LUM)
@@ -97,13 +97,13 @@
 /obj/item/candle/attack_self(mob/user)
 	if(lit)
 		user.visible_message("<span class='notice'>[user] snuffs out [src].</span>")
-		lit = 0
+		lit = FALSE
 		update_icon()
 		set_light(0)
 
 /obj/item/candle/eternal
 	desc = "A candle. This one seems to have an odd quality about the wax."
-	infinite = 1
+	infinite = TRUE
 
 /obj/item/candle/get_spooked()
 	if(lit)

code/game/objects/items/decorations.dm

@@ -218,8 +218,8 @@
 /obj/structure/decorative_structures
 	icon = 'icons/obj/decorations.dmi'
 	icon_state = ""
-	density = 1
-	anchored = 0
+	density = TRUE
+	anchored = FALSE
 	max_integrity = 100
 
 /obj/structure/decorative_structures/metal

code/game/objects/items/devices/flash.dm

@@ -14,10 +14,10 @@
 	origin_tech = "magnets=2;combat=1"
 
 	var/times_used = 0 //Number of times it's been used.
-	var/broken = 0     //Is the flash burnt out?
+	var/broken = FALSE     //Is the flash burnt out?
 	var/last_used = 0 //last world.time it was used.
-	var/battery_panel = 0 //whether the flash can be modified with a cell or not
-	var/overcharged = 0   //if overcharged the flash will set people on fire then immediately burn out (does so even if it doesn't blind them).
+	var/battery_panel = FALSE //whether the flash can be modified with a cell or not
+	var/overcharged = FALSE   //if overcharged the flash will set people on fire then immediately burn out (does so even if it doesn't blind them).
 	var/can_overcharge = TRUE //set this to FALSE if you don't want your flash to be overcharge capable
 	///This tracks the world.time until the flash can be used again
 	var/cooldown
@@ -36,25 +36,25 @@
 		if(istype(I, /obj/item/screwdriver))
 			if(battery_panel)
 				to_chat(user, "<span class='notice'>You close the battery compartment on [src].</span>")
-				battery_panel = 0
+				battery_panel = FALSE
 			else
 				to_chat(user, "<span class='notice'>You open the battery compartment on [src].</span>")
-				battery_panel = 1
+				battery_panel = TRUE
 		if(battery_panel && !overcharged)
 			if(istype(I, /obj/item/stock_parts/cell))
 				to_chat(user, "<span class='notice'>You jam [I] into the battery compartment on [src].</span>")
 				qdel(I)
-				overcharged = 1
-				overlays += "overcharge"
+				overcharged = TRUE
+				add_overlay("overcharge")
 
 /obj/item/flash/random/New()
 	..()
 	if(prob(25))
-		broken = 1
+		broken = TRUE
 		icon_state = "[initial(icon_state)]burnt"
 
 /obj/item/flash/proc/burn_out() //Made so you can override it if you want to have an invincible flash from R&D or something.
-	broken = 1
+	broken = TRUE
 	icon_state = "[initial(icon_state)]burnt"
 	visible_message("<span class='notice'>[src] burns out!</span>")
 

code/game/objects/items/devices/flashlight.dm

@@ -182,7 +182,7 @@
 	if(!fuel || !on)
 		turn_off()
 		if(!fuel)
-			src.icon_state = "[initial(icon_state)]-empty"
+			icon_state = "[initial(icon_state)]-empty"
 		STOP_PROCESSING(SSobj, src)
 
 /obj/item/flashlight/flare/Destroy()
@@ -190,9 +190,9 @@
 	return ..()
 
 /obj/item/flashlight/flare/proc/turn_off()
-	on = 0
-	src.force = initial(src.force)
-	src.damtype = initial(src.damtype)
+	on = FALSE
+	force = initial(force)
+	damtype = initial(damtype)
 	if(ismob(loc))
 		var/mob/U = loc
 		update_brightness(U)
@@ -220,8 +220,8 @@
 	// All good, turn it on.
 	if(.)
 		user.visible_message("<span class='notice'>[user] activates [src].</span>", "<span class='notice'>You activate [src].</span>")
-		src.force = on_damage
-		src.damtype = "fire"
+		force = on_damage
+		damtype = "fire"
 		START_PROCESSING(SSobj, src)
 
 // GLOWSTICKS

code/game/objects/items/devices/megaphone.dm

@@ -7,7 +7,7 @@
 	w_class = WEIGHT_CLASS_SMALL
 	flags = CONDUCT
 
-	var/spamcheck = 0
+	var/spamcheck = FALSE
 	var/insults = 0
 	var/span = ""
 	var/list/insultmsg = list("FUCK EVERYONE!", "I'M A TATER!", "ALL SECURITY TO SHOOT ME ON SIGHT!", "I HAVE A BOMB!", "CAPTAIN IS A COMDOM!", "FOR THE SYNDICATE!")
@@ -60,9 +60,9 @@
 				message = "<span class='[span]'>[message]</span>"
 			saymsg(user, message)
 
-		spamcheck = 1
+		spamcheck = TRUE
 		spawn(20)
-			spamcheck = 0
+			spamcheck = FALSE
 
 /obj/item/megaphone/proc/saymsg(mob/living/user as mob, message)
 	audible_message("<span class='game say'><span class='name'>[user.GetVoice()]</span> [user.GetAltName()] broadcasts, <span class='reallybig'>\"[message]\"</span></span>", hearing_distance = 14)
@@ -77,5 +77,5 @@
 /obj/item/megaphone/emag_act(user as mob)
 	if(!emagged)
 		to_chat(user, "<span class='warning'>You overload \the [src]'s voice synthesizer.</span>")
-		emagged = 1
+		emagged = TRUE
 		insults = rand(1, 3)//to prevent dickflooding

code/game/objects/items/devices/radio/beacon.dm

@@ -5,7 +5,7 @@
 	item_state = "signaler"
 	var/code = "Beacon"
 	origin_tech = "bluespace=1"
-	var/syndicate = 0
+	var/syndicate = FALSE
 	var/area_bypass = FALSE
 	var/cc_beacon = FALSE //set if allowed to teleport to even if on zlevel2
 
@@ -20,8 +20,8 @@
 
 /obj/item/radio/beacon/emag_act(user as mob)
 	if(!emagged)
-		emagged = 1
-		syndicate = 1
+		emagged = TRUE
+		syndicate = TRUE
 		to_chat(user, "<span class='notice'>The This beacon now only be locked on to by emagged teleporters!</span>")
 
 /obj/item/radio/beacon/hear_talk()
@@ -107,7 +107,7 @@
 
 /obj/item/radio/beacon/engine
 	desc = "A label on it reads: <i>Warning: This device is used for transportation of high-density objects used for high-yield power generation. Stay away!</i>."
-	anchored = 1		//Let's not move these around. Some folk might get the idea to use these for assassinations
+	anchored = TRUE		//Let's not move these around. Some folk might get the idea to use these for assassinations
 	var/list/enginetype = list()
 
 /obj/item/radio/beacon/engine/Initialize(mapload)

code/game/objects/items/devices/radio/headset.dm

@@ -350,7 +350,7 @@
 	item_state = "headset"
 	ks2type = /obj/item/encryptionkey/heads/ai_integrated
 	var/myAi = null    // Atlantis: Reference back to the AI which has this radio.
-	var/disabledAi = 0 // Atlantis: Used to manually disable AI's integrated radio via intellicard menu.
+	var/disabledAi = FALSE // Atlantis: Used to manually disable AI's integrated radio via intellicard menu.
 
 /obj/item/radio/headset/heads/ai_integrated/is_listening()
 	if(disabledAi)

code/game/objects/items/devices/radio/intercom.dm

@@ -3,7 +3,7 @@
 	desc = "Talk through this."
 	icon_state = "intercom"
 	layer = ABOVE_WINDOW_LAYER
-	anchored = 1
+	anchored = TRUE
 	w_class = WEIGHT_CLASS_BULKY
 	canhear_range = 2
 	flags = CONDUCT
@@ -15,8 +15,8 @@
 /obj/item/radio/intercom/custom
 	name = "station intercom (Custom)"
 	custom_name = TRUE
-	broadcasting = 0
-	listening = 0
+	broadcasting = FALSE
+	listening = FALSE
 
 /obj/item/radio/intercom/interrogation
 	name = "station intercom (Interrogation)"
@@ -41,8 +41,8 @@
 /obj/item/radio/intercom/department
 	canhear_range = 5
 	custom_name = TRUE
-	broadcasting = 0
-	listening = 1
+	broadcasting = FALSE
+	listening = TRUE
 
 /obj/item/radio/intercom/department/medbay
 	name = "station intercom (Medbay)"
@@ -62,7 +62,7 @@
 			setDir(direction)
 			set_pixel_offsets_from_dir(28, -28, 28, -28)
 		b_stat=1
-		on = 0
+		on = FALSE
 	GLOB.global_intercoms.Add(src)
 	update_icon()
 
@@ -185,7 +185,7 @@
 	if(!I.use_tool(src, user, 10, volume = I.tool_volume) || buildstage != 2)
 		return
 	update_icon()
-	on = 1
+	on = TRUE
 	b_stat = 0
 	buildstage = 3
 	to_chat(user, "<span class='notice'>You secure the electronics!</span>")
@@ -202,7 +202,7 @@
 		return
 	WIRECUTTER_SNIP_MESSAGE
 	new /obj/item/stack/cable_coil(get_turf(src),5)
-	on = 0
+	on = FALSE
 	b_stat = 1
 	buildstage = 1
 	update_icon()

code/game/objects/items/devices/radio/radio.dm

@@ -585,15 +585,15 @@ GLOBAL_LIST_INIT(default_medbay_channels, list(
 	interact(user)
 
 /obj/item/radio/emp_act(severity)
-	on = 0
+	on = FALSE
 	disable_timer++
 	addtimer(CALLBACK(src, .proc/enable_radio), rand(100, 200))
 
 	if(listening)
 		visible_message("<span class='warning'>[src] buzzes violently!</span>")
 
-	broadcasting = 0
-	listening = 0
+	broadcasting = FALSE
+	listening = FALSE
 	for(var/ch_name in channels)
 		channels[ch_name] = 0
 	..()
@@ -602,7 +602,7 @@ GLOBAL_LIST_INIT(default_medbay_channels, list(
 	if(disable_timer > 0)
 		disable_timer--
 	if(!disable_timer)
-		on = 1
+		on = TRUE
 
 /obj/item/radio/proc/recalculateChannels()
 	/// Exists so that borg radios and headsets can override it.
@@ -752,14 +752,14 @@ GLOBAL_LIST_INIT(default_medbay_channels, list(
 	return
 
 /obj/item/radio/off
-	listening = 0
+	listening = FALSE
 	dog_fashion = /datum/dog_fashion/back
 
 /obj/item/radio/phone
-	broadcasting = 0
+	broadcasting = FALSE
 	icon = 'icons/obj/items.dmi'
 	icon_state = "red_phone"
-	listening = 1
+	listening = TRUE
 	name = "phone"
 	dog_fashion = null
 

code/game/objects/items/devices/traitordevices.dm

@@ -27,14 +27,14 @@
 	origin_tech = "magnets=3;biotech=5;syndicate=3"
 	var/intensity = 5 // how much damage the radiation does
 	var/wavelength = 10 // time it takes for the radiation to kick in, in seconds
-	var/used = 0 // is it cooling down?
+	var/used = FALSE // is it cooling down?
 
 /obj/item/rad_laser/attack(mob/living/M, mob/living/user)
 	if(!used)
 		add_attack_logs(user, M, "Irradiated by [src]")
 		user.visible_message("<span class='notice'>[user] analyzes [M]'s vitals.</span>")
 		var/cooldown = round(max(100,(((intensity*8)-(wavelength/2))+(intensity*2))*10))
-		used = 1
+		used = TRUE
 		icon_state = "health1"
 		handle_cooldown(cooldown) // splits off to handle the cooldown while handling wavelength
 		spawn((wavelength+(intensity*4))*10)
@@ -47,7 +47,7 @@
 
 /obj/item/rad_laser/proc/handle_cooldown(cooldown)
 	spawn(cooldown)
-		used = 0
+		used = FALSE
 		icon_state = "health2"
 
 /obj/item/rad_laser/attack_self(mob/user)

code/game/objects/items/devices/transfer_valve.dm

@@ -8,8 +8,8 @@
 	var/obj/item/tank/tank_two = null
 	var/obj/item/assembly/attached_device = null
 	var/mob/living/attacher = null
-	var/valve_open = 0
-	var/toggle = 1
+	var/valve_open = FALSE
+	var/toggle = TRUE
 	origin_tech = "materials=1;engineering=1"
 
 /obj/item/transfer_valve/Destroy()
@@ -147,10 +147,10 @@
 
 /obj/item/transfer_valve/proc/process_activation(obj/item/D)
 	if(toggle)
-		toggle = 0
+		toggle = FALSE
 		toggle_valve()
 		spawn(50) // To stop a signal being spammed from a proxy sensor constantly going off or whatever
-			toggle = 1
+			toggle = TRUE
 
 /obj/item/transfer_valve/update_icon()
 	overlays.Cut()
@@ -192,7 +192,7 @@
 
 /obj/item/transfer_valve/proc/toggle_valve(mob/user)
 	if(!valve_open && tank_one && tank_two)
-		valve_open = 1
+		valve_open = TRUE
 		var/turf/bombturf = get_turf(src)
 		var/area/A = get_area(bombturf)
 
@@ -218,5 +218,5 @@
 
 	else if(valve_open && tank_one && tank_two)
 		split_gases()
-		valve_open = 0
+		valve_open = FALSE
 		update_icon()

code/game/objects/items/devices/uplinks.dm

@@ -127,7 +127,7 @@ GLOBAL_LIST_EMPTY(world_uplinks)
 /obj/item/uplink/hidden
 	name = "hidden uplink"
 	desc = "There is something wrong if you're examining this."
-	var/active = 0
+	var/active = FALSE
 
 // The hidden uplink MUST be inside an obj/item's contents.
 /obj/item/uplink/hidden/New(loc)

code/game/objects/items/devices/whistle.dm

@@ -10,7 +10,7 @@
 	w_class = WEIGHT_CLASS_TINY
 	flags = CONDUCT
 	var/next_use_time
-	var/spamcheck = 0
+	var/spamcheck = FALSE
 
 /obj/item/hailer/attack_self(mob/living/carbon/user as mob)
 	if(world.time < next_use_time)
@@ -28,6 +28,6 @@
 /obj/item/hailer/emag_act(user as mob)
 	if(!emagged)
 		to_chat(user, "<span class='warning'>You overload \the [src]'s voice synthesizer.</span>")
-		emagged = 1
+		emagged = TRUE
 
 #undef USE_COOLDOWN

code/game/objects/items/misc.dm

@@ -14,8 +14,8 @@
 	icon_state = "ball"
 	name = "beach ball"
 	item_state = "beachball"
-	density = 0
-	anchored = 0
+	density = FALSE
+	anchored = FALSE
 	w_class = WEIGHT_CLASS_TINY
 	force = 0.0
 	throwforce = 0.0

code/game/objects/items/random_items.dm

@@ -186,49 +186,9 @@
 		if(prob(85))
 			var/datum/reagent/r = GLOB.chemical_reagents_list[chem]
 			B.name	= "[r.name] bottle"
-//			B.identify_probability = 100
 		else
 			B.name	= "unlabelled bottle"
 			B.desc	= "Looks like the label fell off."
-//			B.identify_probability = 0
-//
-/*
-/obj/structure/closet/crate/bin/flowers
-	name = "flower barrel"
-	desc = "A bin full of fresh flowers for the bereaved."
-	anchored = 0
-	New()
-		while(contents.len < 10)
-			var/flowertype = pick(/obj/item/grown/sunflower,/obj/item/grown/novaflower,/obj/item/reagent_containers/food/snacks/grown/poppy,
-				/obj/item/reagent_containers/food/snacks/grown/harebell,/obj/item/reagent_containers/food/snacks/grown/moonflower)
-			var/atom/movable/AM = new flowertype(src)
-			AM.pixel_x = rand(-10,10)
-			AM.pixel_y = rand(-5,5)
-
-/obj/structure/closet/crate/bin/plants
-	name = "plant barrel"
-	desc = "Caution: Contents may contain vitamins and minerals.  It is recommended that you deep fry them before eating."
-	anchored = 0
-	New()
-		while(contents.len < 10)
-			var/ptype = pick(/obj/item/reagent_containers/food/snacks/grown/apple,/obj/item/reagent_containers/food/snacks/grown/banana,
-							 /obj/item/reagent_containers/food/snacks/grown/berries, /obj/item/reagent_containers/food/snacks/grown/cabbage,
-							 /obj/item/reagent_containers/food/snacks/grown/carrot, /obj/item/reagent_containers/food/snacks/grown/cherries,
-							 /obj/item/reagent_containers/food/snacks/grown/chili, /obj/item/reagent_containers/food/snacks/grown/cocoapod,
-							 /obj/item/reagent_containers/food/snacks/grown/corn, /obj/item/reagent_containers/food/snacks/grown/eggplant,
-							 /obj/item/reagent_containers/food/snacks/grown/grapes, /obj/item/reagent_containers/food/snacks/grown/greengrapes,
-							 /obj/item/reagent_containers/food/snacks/grown/icepepper, /obj/item/reagent_containers/food/snacks/grown/lemon,
-							 /obj/item/reagent_containers/food/snacks/grown/lime, /obj/item/reagent_containers/food/snacks/grown/orange,
-							 /obj/item/reagent_containers/food/snacks/grown/potato, /obj/item/reagent_containers/food/snacks/grown/pumpkin,
-							 /obj/item/reagent_containers/food/snacks/grown/soybeans, /obj/item/reagent_containers/food/snacks/grown/sugarcane,
-							 /obj/item/reagent_containers/food/snacks/grown/tomato, /obj/item/reagent_containers/food/snacks/grown/watermelon,
-							 /obj/item/reagent_containers/food/snacks/grown/wheat, /obj/item/reagent_containers/food/snacks/grown/whitebeet,
-							 /obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle, /obj/item/reagent_containers/food/snacks/grown/mushroom/plumphelmet)
-			var/obj/O = new ptype(src)
-			O.pixel_x = rand(-10,10)
-			O.pixel_y = rand(-5,5)
-*/
-
 /obj/structure/closet/secure_closet/random_drinks
 	name = "unlabelled booze closet"
 	req_access = list(ACCESS_BAR)

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

@@ -6,7 +6,7 @@
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	var/list/part = null
-	var/sabotaged = 0 //Emagging limbs can have repercussions when installed as prosthetics.
+	var/sabotaged = FALSE //Emagging limbs can have repercussions when installed as prosthetics.
 	var/model_info = "Unbranded"
 	dir = SOUTH
 
@@ -279,7 +279,7 @@
 			if(laws_to_give)
 				O.laws = laws_to_give
 			else if(!lawsync)
-				O.lawupdate = 0
+				O.lawupdate = FALSE
 				O.make_laws()
 
 			M.brainmob.mind.transfer_to(O)
@@ -423,4 +423,4 @@
 		to_chat(user, "<span class='warning'>[src] is already sabotaged!</span>")
 	else
 		to_chat(user, "<span class='warning'>You slide the emag into the dataport on [src] and short out the safeties.</span>")
-		sabotaged = 1
+		sabotaged = TRUE

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

@@ -181,7 +181,7 @@
 		to_chat(usr, "<span class='notice'>This unit already has ion thrusters installed!</span>")
 		return
 
-	R.ionpulse = 1
+	R.ionpulse = TRUE
 	return TRUE
 
 /obj/item/borg/upgrade/ddrill
@@ -278,7 +278,7 @@
 	var/repair_amount = -1
 	var/repair_tick = 1
 	var/msg_cooldown = 0
-	var/on = 0
+	var/on = FALSE
 	var/powercost = 10
 	var/mob/living/silicon/robot/cyborg
 
@@ -297,7 +297,7 @@
 /obj/item/borg/upgrade/selfrepair/Destroy()
 	cyborg = null
 	STOP_PROCESSING(SSobj, src)
-	on = 0
+	on = FALSE
 	return ..()
 
 /obj/item/borg/upgrade/selfrepair/ui_action_click()
@@ -321,7 +321,7 @@
 
 /obj/item/borg/upgrade/selfrepair/proc/deactivate()
 	STOP_PROCESSING(SSobj, src)
-	on = 0
+	on = FALSE
 	update_icon()
 
 /obj/item/borg/upgrade/selfrepair/process()

code/game/objects/items/shooting_range.dm

@@ -21,7 +21,7 @@
 	..()
 	// After target moves, check for nearby stakes. If associated, move to target
 	for(var/obj/structure/target_stake/M in view(3, src))
-		if(M.density == 0 && M.pinned_target == src)
+		if(!M.density && M.pinned_target == src)
 			M.loc = loc
 
 	// This may seem a little counter-intuitive but I assure you that's for a purpose.

code/game/objects/items/tools/wirecutters.dm

@@ -17,7 +17,7 @@
 	usesound = 'sound/items/wirecutter.ogg'
 	drop_sound = 'sound/items/handling/wirecutter_drop.ogg'
 	pickup_sound =  'sound/items/handling/wirecutter_pickup.ogg'
-	sharp = 1
+	sharp = TRUE
 	toolspeed = 1
 	armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 30)
 	tool_behaviour = TOOL_WIRECUTTER