Changes some 1s and 0s to TRUE and FALSE (#1967)

This commit is contained in:
CitadelStationBot
2017-07-10 16:13:16 -07:00
committed by kevinz000
parent 1b70c06474
commit ff6bbbedf5
522 changed files with 1924 additions and 1917 deletions
@@ -5,8 +5,8 @@
desc = "An energy field."
icon = 'icons/obj/singularity.dmi'
icon_state = "Contain_F"
anchored = 1
density = 0
anchored = TRUE
density = FALSE
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
use_power = NO_POWER_USE
luminosity = 4
@@ -21,14 +21,14 @@
/obj/machinery/field/containment/attack_hand(mob/user)
if(get_dist(src, user) > 1)
return 0
return FALSE
else
shock(user)
return 1
return TRUE
/obj/machinery/field/containment/attackby(obj/item/W, mob/user, params)
shock(user)
return 1
return TRUE
/obj/machinery/field/containment/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
switch(damage_type)
@@ -38,10 +38,10 @@
playsound(loc, 'sound/effects/empulse.ogg', 75, 1)
/obj/machinery/field/containment/blob_act(obj/structure/blob/B)
return 0
return FALSE
/obj/machinery/field/containment/ex_act(severity, target)
return 0
return FALSE
/obj/machinery/field/containment/attack_animal(mob/living/simple_animal/M)
if(!FG1 || !FG2)
@@ -64,15 +64,15 @@
/obj/machinery/field/containment/proc/set_master(master1,master2)
if(!master1 || !master2)
return 0
return FALSE
FG1 = master1
FG2 = master2
return 1
return TRUE
/obj/machinery/field/containment/shock(mob/living/user)
if(!FG1 || !FG2)
qdel(src)
return 0
return FALSE
..()
/obj/machinery/field/containment/Move()
@@ -84,17 +84,17 @@
// Used for overriding certain procs
/obj/machinery/field
var/hasShocked = 0 //Used to add a delay between shocks. In some cases this used to crash servers by spawning hundreds of sparks every second.
var/hasShocked = FALSE //Used to add a delay between shocks. In some cases this used to crash servers by spawning hundreds of sparks every second.
/obj/machinery/field/CanPass(atom/movable/mover, turf/target, height=0)
if(hasShocked)
return 0
return FALSE
if(isliving(mover)) // Don't let mobs through
shock(mover)
return 0
return FALSE
if(istype(mover, /obj/machinery) || istype(mover, /obj/structure) || istype(mover, /obj/mecha))
bump_field(mover)
return 0
return FALSE
return ..()
/obj/machinery/field/proc/shock(mob/living/user)
@@ -116,12 +116,12 @@
bump_field(user)
/obj/machinery/field/proc/clear_shock()
hasShocked = 0
hasShocked = FALSE
/obj/machinery/field/proc/bump_field(atom/movable/AM as mob|obj)
if(hasShocked)
return 0
hasShocked = 1
return FALSE
hasShocked = TRUE
do_sparks(5, TRUE, AM.loc)
var/atom/target = get_edge_target_turf(AM, get_dir(src, get_step_away(AM, src)))
AM.throw_at(target, 200, 4)