Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit

code/game/objects/items/tanks/jetpack.dm

@@ -50,7 +50,7 @@
 		to_chat(user, "<span class='notice'>You turn the jetpack off.</span>")
 	for(var/X in actions)
 		var/datum/action/A = X
-		A.UpdateButtonIcon()
+		A.UpdateButtons()
 
 /obj/item/tank/jetpack/proc/turn_on(mob/user)
 	on = TRUE

code/game/objects/items/tanks/tanks.dm

@@ -247,19 +247,19 @@
 	air_contents.merge(giver)
 
 	check_status()
-	return 1
+	return TRUE
 
 /obj/item/tank/assume_air_moles(datum/gas_mixture/giver, moles)
 	giver.transfer_to(air_contents, moles)
 
 	check_status()
-	return 1
+	return TRUE
 
 /obj/item/tank/assume_air_ratio(datum/gas_mixture/giver, ratio)
 	giver.transfer_ratio_to(air_contents, ratio)
 
 	check_status()
-	return 1
+	return TRUE
 
 /obj/item/tank/proc/remove_air_volume(volume_to_return)
 	if(!air_contents)
@@ -281,7 +281,7 @@
 	//Handle exploding, leaking, and rupturing of the tank
 
 	if(!air_contents)
-		return 0
+		return FALSE
 
 	var/pressure = air_contents.return_pressure()
 	var/temperature = air_contents.return_temperature()

code/game/objects/items/tanks/watertank.dm

@@ -26,7 +26,7 @@
 
 /obj/item/watertank/item_action_slot_check(slot, mob/user, datum/action/A)
 	if(slot == user.getBackSlot())
-		return 1
+		return TRUE
 
 /obj/item/watertank/proc/toggle_mister(mob/living/user)
 	if(!istype(user))
@@ -88,7 +88,7 @@
 /obj/item/watertank/attackby(obj/item/W, mob/user, params)
 	if(W == noz)
 		remove_noz()
-		return 1
+		return TRUE
 	else
 		return ..()
 
@@ -349,7 +349,7 @@
 
 /obj/item/reagent_containers/chemtank/item_action_slot_check(slot, mob/user, datum/action/A)
 	if(slot == ITEM_SLOT_BACK)
-		return 1
+		return TRUE
 
 /obj/item/reagent_containers/chemtank/proc/toggle_injection()
 	var/mob/living/carbon/human/user = usr