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

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()