Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

modular_sand/code/game/machinery/computer/arcade/tetris.dm

@@ -18,7 +18,7 @@
 
 /obj/machinery/computer/arcade/tetris/Topic(href, href_list)
 	if(..())
-		return 1
+		return TRUE
 	else
 		usr.set_machine(src)
 		if(href_list["tetrisScore"])

modular_sand/code/game/objects/items/chrono_eraser.dm

@@ -39,7 +39,7 @@
 
 /obj/item/chrono_eraser/item_action_slot_check(slot, mob/user, datum/action/A)
 	if(slot == ITEM_SLOT_BACK)
-		return 1
+		return TRUE
 
 /obj/item/gun/energy/chrono_gun
 	name = "T.E.D. Projection Apparatus"
@@ -114,9 +114,9 @@
 			var/turf/currentpos = get_turf(src)
 			var/mob/living/user = loc
 			if((currentpos == startpos) && (field in view(CHRONO_BEAM_RANGE, currentpos)) && (user.mobility_flags & MOBILITY_STAND) && (user.stat == CONSCIOUS))
-				return 1
+				return TRUE
 		field_disconnect(F)
-		return 0
+		return FALSE
 
 /obj/item/gun/energy/chrono_gun/proc/pass_mind(datum/mind/M)
 	if(TED)
@@ -254,7 +254,7 @@
 		return BULLET_ACT_HIT
 
 /obj/structure/chrono_field/assume_air()
-	return 0
+	return FALSE
 
 /obj/structure/chrono_field/return_air() //we always have nominal air and temperature
 	var/datum/gas_mixture/GM = new

modular_sand/code/modules/clothing/spacesuits/chronosuit.dm

@@ -97,7 +97,7 @@
 		if(camera)
 			camera.remove_target_ui()
 			camera.forceMove(user)
-		teleport_now.UpdateButtonIcon()
+		teleport_now.UpdateButtons()
 
 /obj/item/clothing/suit/space/chronos/proc/chronowalk(atom/location)
 	var/mob/living/carbon/human/user = src.loc
@@ -111,7 +111,7 @@
 		if(camera)
 			camera.remove_target_ui()
 
-		teleport_now.UpdateButtonIcon()
+		teleport_now.UpdateButtons()
 
 		user.ExtinguishMob()
 

modular_sand/code/modules/mining/lavaland/necropolis_chests.dm

@@ -113,7 +113,7 @@
 
 /obj/item/gun/ballistic/revolver/doublebarrel/super/attack_self(mob/living/user)
 	if(toggled)
-		return 0
+		return FALSE
 	else
 		..()
 
@@ -121,10 +121,10 @@
 	if(toggled)
 		charge_tick++
 		if(charge_tick < recharge_rate)
-			return 0
+			return FALSE
 		charge_tick = 0
 		chambered.newshot()
-		return 1
+		return TRUE
 	else
 		..()
 
@@ -700,7 +700,8 @@
 	desc = "Become immune to lava for a brief period of time."
 	check_flags = AB_CHECK_RESTRAINED|AB_CHECK_STUN|AB_CHECK_CONSCIOUS
 	cooldown_time = 2 MINUTES //two full minutes
-	use_target_appearance = TRUE
+	icon_icon = 'icons/obj/clothing/accessories.dmi'
+	button_icon_state = "gold"
 
 /obj/item/clothing/accessory/lavawalk/proc/activate(datum/action/cooldown/lavawalk/action, obj/item/clothing/accessory/lavawalk/item)
 	var/mob/living/L = usr
@@ -709,7 +710,7 @@
 		L.balloon_alert(L, "activated")
 		ADD_TRAIT(L, TRAIT_ASHSTORM_IMMUNE, src)
 		ADD_TRAIT(L, TRAIT_LAVA_IMMUNE, src)
-		timer = addtimer(CALLBACK(src, .proc/reset_user, L), effectduration)
+		timer = addtimer(CALLBACK(src, .proc/reset_user, L), effectduration, TIMER_STOPPABLE)
 		action.StartCooldown()
 
 /obj/item/clothing/accessory/lavawalk/proc/reset_user(mob/living/user)
@@ -717,7 +718,7 @@
 	REMOVE_TRAIT(user, TRAIT_LAVA_IMMUNE, src)
 	to_chat(user, span_boldwarning("\The [src]'s glow dims."))
 	user.balloon_alert(user, "wore off")
-	QDEL_NULL(timer)
+	deltimer(timer)
 
 //Nerfing those on the chest because too OP yada yada
 /obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor/damaged

modular_sand/code/modules/mob/living/silicon/robot/robot.dm

@@ -17,7 +17,7 @@
 		QDEL_NULL(builtInCamera)
 
 /mob/living/silicon/robot/modules/roleplay/binarycheck()
-	return 0 //Roleplay borgs aren't truly borgs
+	return FALSE //Roleplay borgs aren't truly borgs
 
 /// Allows "cyborg" players to change gender at will
 /mob/living/silicon/robot/verb/toggle_gender()

modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm

@@ -53,7 +53,7 @@
 	for(var/mob/living/simple_animal/hostile/megafauna/H in around)
 		if(faction_check_mob(H) && !attack_same && !H.attack_same)
 			H.enemies |= enemies
-	return 0
+	return FALSE
 
 /mob/living/simple_animal/hostile/megafauna/adjustHealth(amount, updating_health = TRUE, forced = FALSE)
 	. = ..()

modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/sif.dm

@@ -229,7 +229,7 @@ Difficulty: Medium
 	if(passed == 1)
 		visible_message(span_danger("[src] dodged the projectile!"), span_userdanger("You dodge the projectile!"))
 		playsound(src, pick('sound/weapons/bulletflyby.ogg', 'sound/weapons/bulletflyby2.ogg', 'sound/weapons/bulletflyby3.ogg'), 300, 1)
-		return 0
+		return FALSE
 
 	return ..()
 
@@ -304,7 +304,7 @@ Difficulty: Medium
 
 //Immune to explosions when spinning or charging
 /mob/living/simple_animal/hostile/megafauna/sif/ex_act(severity, target, origin)
-	return 0
+	return FALSE
 
 //stop spinning if you lose the target
 /mob/living/simple_animal/hostile/megafauna/sif/LoseTarget()

modular_sand/code/modules/resize/resizing.dm

@@ -158,8 +158,8 @@
 /*
 /mob/living/proc/sizeinteractioncheck(mob/living/target)
 	if(abs(get_effective_size()/target.get_effective_size())>=2.0 && get_effective_size()>target.get_effective_size())
-		return 0
+		return FALSE
 	else
-		return 1
+		return TRUE
 */
 //Clothes coming off at different sizes, and health/speed/stam changes as well

modular_sand/code/modules/resize/sizegun.dm

@@ -33,7 +33,7 @@
 			if((0 - INFINITY) to RESIZE_NORMAL)
 				new_size = RESIZE_MICRO
 		living.update_size(new_size)
-	return 1
+	return TRUE
 
 /obj/item/projectile/sizelaser/growthray/on_hit(atom/target, blocked = 0 )
 	if(isliving(target))
@@ -55,7 +55,7 @@
 			if((0 - INFINITY) to RESIZE_MICRO)
 				new_size = RESIZE_MICRO
 		living.update_size(new_size)
-	return 1
+	return TRUE
 
 /obj/item/ammo_casing/energy/laser/growthray
 	projectile_type = /obj/item/projectile/sizelaser/growthray