diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index d0ab1ab21a8..f20a2193029 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -47,7 +47,7 @@ . += 360 //Returns location. Returns null if no location was found. -/proc/get_teleport_loc(turf/location,mob/target,distance = 1, density = 0, errorx = 0, errory = 0, eoffsetx = 0, eoffsety = 0) +/proc/get_teleport_loc(turf/location,mob/target,distance = 1, density = TRUE, errorx = 0, errory = 0, eoffsetx = 0, eoffsety = 0) /* Location where the teleport begins, target that will teleport, distance to go, density checking 0/1(yes/no). Random error in tile placement x, error in tile placement y, and block offset. @@ -305,7 +305,7 @@ Turf and target are seperate in case you want to teleport some distance from a t for(var/mob/living/silicon/ai/A in GLOB.alive_mob_list) if(A.stat == DEAD) continue - if(A.control_disabled == 1) + if(A.control_disabled) continue . += A return . @@ -774,8 +774,8 @@ Returns 1 if the chain up to the area contains the given typepath // Spawn a new shuttle corner object var/obj/corner = new() corner.loc = X - corner.density = 1 - corner.anchored = 1 + corner.density = TRUE + corner.anchored = TRUE corner.icon = X.icon corner.icon_state = replacetext(X.icon_state, "_s", "_f") corner.tag = "delete me" @@ -1145,7 +1145,7 @@ GLOBAL_LIST_INIT(can_embed_types, typecacheof(list( return 0 if(istype(W, /obj/item/match)) var/obj/item/match/O = W - if(O.lit == 1) + if(O.lit) return 1000 else return 0 @@ -1416,7 +1416,7 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new) /mob/dview invisibility = 101 - density = 0 + density = FALSE move_force = 0 pull_force = 0 move_resist = INFINITY diff --git a/code/_onclick/ai.dm b/code/_onclick/ai.dm index 74453f47c62..2ac7a25bd27 100644 --- a/code/_onclick/ai.dm +++ b/code/_onclick/ai.dm @@ -95,7 +95,7 @@ if(waypoint_mode) set_waypoint(A) - waypoint_mode = 0 + waypoint_mode = FALSE return /* AI restrained() currently does nothing diff --git a/code/_onclick/hud/robot.dm b/code/_onclick/hud/robot.dm index 7d96db38a05..ad7794d2ae0 100644 --- a/code/_onclick/hud/robot.dm +++ b/code/_onclick/hud/robot.dm @@ -250,5 +250,5 @@ if( (A != R.module_state_1) && (A != R.module_state_2) && (A != R.module_state_3) ) //Module is not currently active R.client.screen -= A - R.shown_robot_modules = 0 + R.shown_robot_modules = FALSE R.client.screen -= R.robot_modules_background diff --git a/code/controllers/subsystem/jobs.dm b/code/controllers/subsystem/jobs.dm index 40549815324..c044e80b641 100644 --- a/code/controllers/subsystem/jobs.dm +++ b/code/controllers/subsystem/jobs.dm @@ -388,7 +388,7 @@ SUBSYSTEM_DEF(jobs) Debug("AC2 Assistant located, Player: [player]") AssignRole(player, "Assistant") else if(player.client.prefs.active_character.alternate_option == RETURN_TO_LOBBY) - player.ready = 0 + player.ready = FALSE unassigned -= player log_debug("Dividing Occupations took [stop_watch(watch)]s") @@ -539,7 +539,7 @@ SUBSYSTEM_DEF(jobs) var/never = 0 //never var/banned = 0 //banned var/young = 0 //account too young - var/disabled = 0 //has disability rendering them ineligible + var/disabled = FALSE //has disability rendering them ineligible for(var/mob/new_player/player in GLOB.player_list) if(!(player.ready && player.mind && !player.mind.assigned_role)) continue //This player is not ready diff --git a/code/controllers/subsystem/nano_mob_hunter.dm b/code/controllers/subsystem/nano_mob_hunter.dm index b8a5d09e0b5..738957d1b48 100644 --- a/code/controllers/subsystem/nano_mob_hunter.dm +++ b/code/controllers/subsystem/nano_mob_hunter.dm @@ -133,8 +133,8 @@ SUBSYSTEM_DEF(mob_hunt) loser_terminal = blue_terminal winner_terminal = red_terminal battle_turn = null - winner_terminal.ready = 0 - loser_terminal.ready = 0 + winner_terminal.ready = FALSE + loser_terminal.ready = FALSE if(surrender) //surrender doesn't give exp, to avoid people just farming exp without actually doing a battle winner_terminal.atom_say("Your rival surrendered!") else diff --git a/code/datums/action.dm b/code/datums/action.dm index ab27c2b0fea..bf1843c32d3 100644 --- a/code/datums/action.dm +++ b/code/datums/action.dm @@ -409,7 +409,7 @@ /datum/action/item_action/toggle_research_scanner/Remove(mob/living/L) if(owner) - owner.research_scanner = 0 + owner.research_scanner = FALSE ..() /datum/action/item_action/toggle_research_scanner/ApplyIcon(obj/screen/movable/action_button/current_button) diff --git a/code/datums/beam.dm b/code/datums/beam.dm index 3766209c817..dab9cbbf6a8 100644 --- a/code/datums/beam.dm +++ b/code/datums/beam.dm @@ -9,10 +9,10 @@ var/max_distance = 0 var/endtime = 0 var/sleep_time = 3 - var/finished = 0 + var/finished = FALSE var/target_oldloc = null var/origin_oldloc = null - var/static_beam = 0 + var/static_beam = FALSE var/beam_type = /obj/effect/ebeam //must be subtype /datum/beam/New(beam_origin,beam_target,beam_icon='icons/effects/beam.dmi',beam_icon_state="b_beam",time=50,maxdistance=10,btype = /obj/effect/ebeam,beam_sleep_time=3) @@ -23,7 +23,7 @@ target_oldloc = get_turf(target) sleep_time = beam_sleep_time if(origin_oldloc == origin && target_oldloc == target) - static_beam = 1 + static_beam = TRUE max_distance = maxdistance base_icon = new(beam_icon,beam_icon_state) icon = beam_icon @@ -45,7 +45,7 @@ qdel(src) /datum/beam/proc/End() - finished = 1 + finished = TRUE /datum/beam/proc/Reset() QDEL_LIST(elements) @@ -111,7 +111,7 @@ /obj/effect/ebeam mouse_opacity = MOUSE_OPACITY_TRANSPARENT - anchored = 1 + anchored = TRUE var/datum/beam/owner /obj/effect/ebeam/ex_act(severity) diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm index 132ddf6ff66..de231da673c 100644 --- a/code/datums/diseases/advance/advance.dm +++ b/code/datums/diseases/advance/advance.dm @@ -36,7 +36,7 @@ GLOBAL_LIST_INIT(advance_cures, list( var/list/symptoms = list() // The symptoms of the disease. var/id = "" - var/processing = 0 + var/processing = FALSE /* @@ -74,7 +74,7 @@ GLOBAL_LIST_INIT(advance_cures, list( if(symptoms && symptoms.len) if(!processing) - processing = 1 + processing = TRUE for(var/datum/symptom/S in symptoms) S.Start(src) diff --git a/code/datums/mind.dm b/code/datums/mind.dm index d8e73af8015..88ffb1aad57 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -27,7 +27,7 @@ var/original_mob_UID /// The original mob's name. Used in Dchat messages var/original_mob_name - var/active = 0 + var/active = FALSE var/memory @@ -866,7 +866,7 @@ if(!flash) to_chat(usr, "Repairing flash failed!") else - flash.broken = 0 + flash.broken = FALSE log_admin("[key_name(usr)] has repaired [key_name(current)]'s flash") message_admins("[key_name_admin(usr)] has repaired [key_name_admin(current)]'s flash") @@ -1794,7 +1794,7 @@ /mob/proc/sync_mind() mind_initialize() //updates the mind (or creates and initializes one if one doesn't exist) - mind.active = 1 //indicates that the mind is currently synced with a client + mind.active = TRUE //indicates that the mind is currently synced with a client //slime /mob/living/simple_animal/slime/mind_initialize() diff --git a/code/datums/wires/alarm.dm b/code/datums/wires/alarm.dm index cd13c9fe1d8..d47864fc01f 100644 --- a/code/datums/wires/alarm.dm +++ b/code/datums/wires/alarm.dm @@ -31,7 +31,7 @@ switch(wire) if(WIRE_IDSCAN) if(!mend) - A.locked = 1 + A.locked = TRUE if(WIRE_MAIN_POWER1) A.shock(usr, 50) diff --git a/code/datums/wires/nuclearbomb.dm b/code/datums/wires/nuclearbomb.dm index 51918c02ff4..3515f2e1bbc 100644 --- a/code/datums/wires/nuclearbomb.dm +++ b/code/datums/wires/nuclearbomb.dm @@ -51,7 +51,7 @@ if(!N.lighthack) if(N.icon_state == "nuclearbomb2") N.icon_state = "nuclearbomb1" - N.timing = 0 + N.timing = FALSE GLOB.bomb_set = FALSE if(WIRE_BOMB_LIGHT)