From 79dc377692685bfe54b48bff0d1cf711f817e04c Mon Sep 17 00:00:00 2001 From: dageavtobusnick <71216640+dageavtobusnick@users.noreply.github.com> Date: Mon, 4 Nov 2024 21:39:32 +0500 Subject: [PATCH] remove if spaces --- code/__HELPERS/_logging.dm | 2 +- code/__HELPERS/chat.dm | 2 +- code/controllers/subsystem/fluids.dm | 20 ++++++------- code/datums/components/blob_minion.dm | 14 +++++----- code/datums/components/connect_containers.dm | 2 +- .../datums/components/ghost_direct_control.dm | 28 +++++++++---------- code/datums/components/stationloving.dm | 14 +++++----- code/game/atoms.dm | 2 +- .../fluid_spread/_fluid_spread.dm | 6 ++-- code/game/objects/obj_defense.dm | 2 +- .../antagonists/blob/blob_infected_datum.dm | 2 +- .../blob/blob_minions/blob_spore.dm | 12 ++++---- .../blob/blob_minions/blob_zombie.dm | 4 +-- .../blob/blob_minions/blobbernaut.dm | 16 +++++------ .../blob/blobstrains/_blobstrain.dm | 2 +- .../blob/blobstrains/debris_devourer.dm | 16 +++++------ .../antagonists/blob/blobstrains/multiplex.dm | 6 ++-- code/modules/antagonists/blob/overmind.dm | 20 ++++++------- code/modules/antagonists/blob/powers.dm | 16 +++++------ .../antagonists/blob/structures/core.dm | 2 +- .../antagonists/blob/structures/factory.dm | 4 +-- .../antagonists/blob/structures/normal.dm | 2 +- code/modules/mob/mob.dm | 2 +- 23 files changed, 98 insertions(+), 98 deletions(-) diff --git a/code/__HELPERS/_logging.dm b/code/__HELPERS/_logging.dm index 4bcf8c2e248..5d61aa41ad7 100644 --- a/code/__HELPERS/_logging.dm +++ b/code/__HELPERS/_logging.dm @@ -402,7 +402,7 @@ GLOBAL_PROTECT(log_end) return "(INVALID LOCATION)" var/turf/T = A - if (!istype(T)) + if(!istype(T)) T = get_turf(A) if(istype(T)) diff --git a/code/__HELPERS/chat.dm b/code/__HELPERS/chat.dm index a686b12cc1a..3f9679e3433 100644 --- a/code/__HELPERS/chat.dm +++ b/code/__HELPERS/chat.dm @@ -2,7 +2,7 @@ /proc/send_to_observers(message, source) var/list/all_observers = GLOB.dead_player_list + GLOB.current_observers_list for(var/mob/observer as anything in all_observers) - if (isnull(source)) + if(isnull(source)) to_chat(observer, "[message]") continue var/link = FOLLOW_LINK(observer, source) diff --git a/code/controllers/subsystem/fluids.dm b/code/controllers/subsystem/fluids.dm index 5ab7930b043..111e2f3af1b 100644 --- a/code/controllers/subsystem/fluids.dm +++ b/code/controllers/subsystem/fluids.dm @@ -60,16 +60,16 @@ SUBSYSTEM_DEF(fluids) * Ensures that the subsystem's fire wait evenly splits the spread and effect waits. */ /datum/controller/subsystem/fluids/proc/initialize_waits() - if (spread_wait <= 0) + if(spread_wait <= 0) WARNING("[src] has the invalid spread wait [spread_wait].") spread_wait = 1 SECONDS - if (effect_wait <= 0) + if(effect_wait <= 0) WARNING("[src] has the invalid effect wait [effect_wait].") spread_wait = 1 SECONDS // Sets the overall wait of the subsystem to evenly divide both the effect and spread waits. var/max_wait = Gcd(spread_wait, effect_wait) - if (max_wait < wait || wait <= 0) + if(max_wait < wait || wait <= 0) wait = max_wait else // If the wait of the subsystem overall is set to a valid value make the actual wait of the subsystem evenly divide that as well. @@ -138,7 +138,7 @@ SUBSYSTEM_DEF(fluids) to_spread.spread(seconds_per_tick) to_spread.spread_bucket = null - if (MC_TICK_CHECK) + if(MC_TICK_CHECK) break MC_SPLIT_TICK // Start processing fluid effects: @@ -154,12 +154,12 @@ SUBSYSTEM_DEF(fluids) var/obj/effect/particle_effect/fluid/to_process = currentrun[currentrun.len] currentrun.len-- - if (QDELETED(to_process) || to_process.process(seconds_per_tick) == PROCESS_KILL) + if(QDELETED(to_process) || to_process.process(seconds_per_tick) == PROCESS_KILL) effect_carousel[cached_bucket_index] -= to_process to_process.effect_bucket = null to_process.datum_flags &= ~DF_ISPROCESSING - if (MC_TICK_CHECK) + if(MC_TICK_CHECK) break /** @@ -169,7 +169,7 @@ SUBSYSTEM_DEF(fluids) * - [node][/obj/effect/particle_effect/fluid]: The node to queue to spread. */ /datum/controller/subsystem/fluids/proc/queue_spread(obj/effect/particle_effect/fluid/node) - if (node.spread_bucket) + if(node.spread_bucket) return spread_carousel[spread_bucket_index] += node @@ -187,7 +187,7 @@ SUBSYSTEM_DEF(fluids) var/bucket_index = node.spread_bucket spread_carousel[bucket_index] -= node - if (bucket_index == spread_bucket_index) + if(bucket_index == spread_bucket_index) currently_spreading -= node node.spread_bucket = null @@ -201,7 +201,7 @@ SUBSYSTEM_DEF(fluids) * - [node][/obj/effect/particle_effect/fluid]: The node to start processing. */ /datum/controller/subsystem/fluids/proc/start_processing(obj/effect/particle_effect/fluid/node) - if (node.datum_flags & DF_ISPROCESSING || node.effect_bucket) + if(node.datum_flags & DF_ISPROCESSING || node.effect_bucket) return // Edit this value to make all fluids process effects (at the same time|offset by when they started processing| -> offset by a random amount <- ) @@ -225,7 +225,7 @@ SUBSYSTEM_DEF(fluids) return effect_carousel[bucket_index] -= node - if (bucket_index == effect_bucket_index) + if(bucket_index == effect_bucket_index) currently_processing -= node node.effect_bucket = null diff --git a/code/datums/components/blob_minion.dm b/code/datums/components/blob_minion.dm index 99925936677..dcbf7b274b2 100644 --- a/code/datums/components/blob_minion.dm +++ b/code/datums/components/blob_minion.dm @@ -10,18 +10,18 @@ /datum/component/blob_minion/Initialize(mob/camera/blob/overmind, datum/callback/on_strain_changed) . = ..() - if (!isminion(parent)) + if(!isminion(parent)) return COMPONENT_INCOMPATIBLE src.on_strain_changed = on_strain_changed register_overlord(overmind) /datum/component/blob_minion/InheritComponent(datum/component/new_comp, i_am_original, mob/camera/blob/overmind, datum/callback/on_strain_changed) - if (!isnull(on_strain_changed)) + if(!isnull(on_strain_changed)) src.on_strain_changed = on_strain_changed register_overlord(overmind) /datum/component/blob_minion/proc/register_overlord(mob/camera/blob/overmind) - if (isnull(overmind)) + if(isnull(overmind)) return src.overmind = overmind overmind.register_new_minion(parent) @@ -61,7 +61,7 @@ GLOB.blob_telepathy_mobs |= parent /datum/component/blob_minion/UnregisterFromParent() - if (!isnull(overmind)) + if(!isnull(overmind)) overmind.blob_mobs -= parent var/mob/living/living_parent = parent living_parent.pass_flags &= ~PASSBLOB @@ -83,7 +83,7 @@ /// Become blobpilled when we gain a mind /datum/component/blob_minion/proc/on_mind_init(mob/living/minion, datum/mind/new_mind) SIGNAL_HANDLER - if (isnull(overmind) || new_mind.has_antag_datum(/datum/antagonist/blob_minion)) + if(isnull(overmind) || new_mind.has_antag_datum(/datum/antagonist/blob_minion)) return var/datum_type = (isblobbernaut(minion))? /datum/antagonist/blob_minion/blobernaut : /datum/antagonist/blob_minion @@ -101,7 +101,7 @@ /// When our icon is updated, update our colour too /datum/component/blob_minion/proc/on_update_status_tab(mob/living/minion, list/status_items) SIGNAL_HANDLER - if (isnull(overmind)) + if(isnull(overmind)) return status_items += list(list("Критическая Масса:", "[TOTAL_BLOB_MASS]/[NEEDED_BLOB_MASS]")) @@ -136,7 +136,7 @@ /datum/component/blob_minion/proc/on_space_move(mob/living/minion) SIGNAL_HANDLER var/obj/structure/blob/blob_handhold = locate() in range(1, parent) - if (!isnull(blob_handhold)) + if(!isnull(blob_handhold)) return COMSIG_MOVABLE_STOP_SPACEMOVE /// We only speak telepathically to blobs diff --git a/code/datums/components/connect_containers.dm b/code/datums/components/connect_containers.dm index 22efc634359..6f793c860e1 100644 --- a/code/datums/components/connect_containers.dm +++ b/code/datums/components/connect_containers.dm @@ -12,7 +12,7 @@ /datum/component/connect_containers/Initialize(atom/movable/tracked, list/connections) . = ..() - if (!ismovable(tracked)) + if(!ismovable(tracked)) return COMPONENT_INCOMPATIBLE src.connections = connections diff --git a/code/datums/components/ghost_direct_control.dm b/code/datums/components/ghost_direct_control.dm index ca51321a7e5..6cd966cdcb1 100644 --- a/code/datums/components/ghost_direct_control.dm +++ b/code/datums/components/ghost_direct_control.dm @@ -26,7 +26,7 @@ datum/callback/after_assumed_control, ) . = ..() - if (!isliving(parent)) + if(!isliving(parent)) return COMPONENT_INCOMPATIBLE src.ban_type = ban_type @@ -37,7 +37,7 @@ var/mob/mob_parent = parent LAZYADD(GLOB.mob_spawners[format_text("[initial(mob_parent.name)]")], mob_parent) - if (poll_candidates) + if(poll_candidates) INVOKE_ASYNC(src, PROC_REF(request_ghost_control), poll_question, role_name || "[parent]", poll_length, antag_age_check, check_antaghud) /datum/component/ghost_direct_control/RegisterWithParent() @@ -65,10 +65,10 @@ /// Inform ghosts that they can possess this /datum/component/ghost_direct_control/proc/on_examined(datum/source, mob/user, list/examine_text) SIGNAL_HANDLER - if (!isobserver(user)) + if(!isobserver(user)) return var/mob/living/our_mob = parent - if (our_mob.stat == DEAD || our_mob.key || awaiting_ghosts) + if(our_mob.stat == DEAD || our_mob.key || awaiting_ghosts) return examine_text += span_boldnotice("You could take control of this mob by clicking on it.") @@ -93,15 +93,15 @@ /// A ghost clicked on us, they want to get in this body /datum/component/ghost_direct_control/proc/on_ghost_clicked(mob/our_mob, mob/dead/observer/hopeful_ghost) SIGNAL_HANDLER - if (our_mob.key) + if(our_mob.key) qdel(src) return - if (!hopeful_ghost.client) + if(!hopeful_ghost.client) return - if (awaiting_ghosts) + if(awaiting_ghosts) to_chat(hopeful_ghost, span_warning("Ghost candidate selection currently in progress!")) return COMPONENT_CANCEL_ATTACK_CHAIN - if (!SSticker.HasRoundStarted()) + if(!SSticker.HasRoundStarted()) to_chat(hopeful_ghost, span_warning("You cannot assume control of this until after the round has started!")) return COMPONENT_CANCEL_ATTACK_CHAIN INVOKE_ASYNC(src, PROC_REF(attempt_possession), our_mob, hopeful_ghost) @@ -110,27 +110,27 @@ /// We got far enough to establish that this mob is a valid target, let's try to posssess it /datum/component/ghost_direct_control/proc/attempt_possession(mob/our_mob, mob/dead/observer/hopeful_ghost) var/ghost_asked = tgui_alert(usr, "Become [our_mob]?", "Are you sure?", list("Yes", "No")) - if (ghost_asked != "Yes" || QDELETED(our_mob)) + if(ghost_asked != "Yes" || QDELETED(our_mob)) return assume_direct_control(hopeful_ghost) /// Grant possession of our mob, component is now no longer required /datum/component/ghost_direct_control/proc/assume_direct_control(mob/harbinger) - if (QDELETED(src)) + if(QDELETED(src)) to_chat(harbinger, span_warning("Offer to possess creature has expired!")) return - if (jobban_isbanned(harbinger, ban_type)) + if(jobban_isbanned(harbinger, ban_type)) to_chat(harbinger, span_warning("You are banned from playing as this role!")) return var/mob/living/new_body = parent - if (new_body.stat == DEAD) + if(new_body.stat == DEAD) to_chat(harbinger, span_warning("This body has passed away, it is of no use!")) return - if (new_body.key) + if(new_body.key) to_chat(harbinger, span_warning("[parent] has already become sapient!")) qdel(src) return - if (extra_control_checks && !extra_control_checks.Invoke(harbinger)) + if(extra_control_checks && !extra_control_checks.Invoke(harbinger)) return add_game_logs("took control of [new_body].", harbinger) diff --git a/code/datums/components/stationloving.dm b/code/datums/components/stationloving.dm index 1ec0aadcb39..d5cdfe0078d 100644 --- a/code/datums/components/stationloving.dm +++ b/code/datums/components/stationloving.dm @@ -41,8 +41,8 @@ qdel(GetComponent(/datum/component/connect_containers)) /datum/component/stationloving/InheritComponent(datum/component/stationloving/newc, original, inform_admins, allow_death) - if (original) - if (newc) + if(original) + if(newc) inform_admins = newc.inform_admins allow_death = newc.allow_item_destruction else @@ -133,20 +133,20 @@ )) // Our loc is a secluded location = not in bounds - if (atom_to_check.loc && HAS_TRAIT(atom_to_check.loc, TRAIT_SECLUDED_LOCATION)) + if(atom_to_check.loc && HAS_TRAIT(atom_to_check.loc, TRAIT_SECLUDED_LOCATION)) return FALSE // No turf below us = nullspace = not in bounds var/turf/destination_turf = get_turf(atom_to_check) - if (!destination_turf) + if(!destination_turf) return FALSE - if (is_station_level(destination_turf.z)) + if(is_station_level(destination_turf.z)) return TRUE if(atom_to_check.onSyndieBase()) return TRUE var/area/destination_area = destination_turf.loc - if (is_admin_level(destination_turf.z)) - if (is_type_in_typecache(destination_area, disallowed_centcom_areas)) + if(is_admin_level(destination_turf.z)) + if(is_type_in_typecache(destination_area, disallowed_centcom_areas)) return FALSE return TRUE return FALSE diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 8d42650e8e7..34ddf94ba44 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -639,7 +639,7 @@ */ /atom/proc/blob_act(obj/structure/blob/attacking_blob) var/blob_act_result = SEND_SIGNAL(src, COMSIG_ATOM_BLOB_ACT, attacking_blob) - if (blob_act_result & COMPONENT_CANCEL_BLOB_ACT) + if(blob_act_result & COMPONENT_CANCEL_BLOB_ACT) return FALSE return TRUE diff --git a/code/game/objects/effects/effect_system/fluid_spread/_fluid_spread.dm b/code/game/objects/effects/effect_system/fluid_spread/_fluid_spread.dm index b00198ddcc1..317b56ce6a8 100644 --- a/code/game/objects/effects/effect_system/fluid_spread/_fluid_spread.dm +++ b/code/game/objects/effects/effect_system/fluid_spread/_fluid_spread.dm @@ -125,7 +125,7 @@ /datum/effect_system/fluid_spread/start(log = FALSE) var/location = src.location || get_turf(holder) var/obj/effect/particle_effect/fluid/flood = new effect_type(location, new /datum/fluid_group(amount)) - if (log) // Smoke is used as an aesthetic effect in a tonne of places and we don't want, say, a broken secway spamming admin chat. + if(log) // Smoke is used as an aesthetic effect in a tonne of places and we don't want, say, a broken secway spamming admin chat. help_out_the_admins(flood, holder, location) flood.spread() @@ -140,12 +140,12 @@ /datum/effect_system/fluid_spread/proc/help_out_the_admins(obj/effect/particle_effect/fluid/flood, atom/holder, atom/location) var/source_msg var/blame_msg - if (holder) + if(holder) holder.transfer_fingerprints_to(flood) // This is important. If this doesn't exist thermobarics are annoying to adjudicate. source_msg = "from inside of [ismob(holder) ? ADMIN_LOOKUPFLW(holder) : ADMIN_VERBOSEJMP(holder)]" var/lastkey = holder.fingerprintslast - if (lastkey) + if(lastkey) var/mob/scapegoat = get_mob_by_key(lastkey) blame_msg = " last touched by [ADMIN_LOOKUPFLW(scapegoat)]" else diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm index 0156310ad83..094dc3a3d10 100644 --- a/code/game/objects/obj_defense.dm +++ b/code/game/objects/obj_defense.dm @@ -110,7 +110,7 @@ /obj/blob_act(obj/structure/blob/B) - if (!..() || (obj_flags & IGNORE_BLOB_ACT)) + if(!..() || (obj_flags & IGNORE_BLOB_ACT)) return if(isturf(loc)) var/turf/T = loc diff --git a/code/modules/antagonists/blob/blob_infected_datum.dm b/code/modules/antagonists/blob/blob_infected_datum.dm index cd0e32bb8ac..3e4dc54104d 100644 --- a/code/modules/antagonists/blob/blob_infected_datum.dm +++ b/code/modules/antagonists/blob/blob_infected_datum.dm @@ -245,7 +245,7 @@ blob_client = GLOB.directory[ckey(owner.key)] location = get_turf(C) var/datum/game_mode/mode= SSticker.mode - if (ismob(C.loc)) + if(ismob(C.loc)) var/mob/M = C.loc M.gib() if(!is_station_level(location.z) || isspaceturf(location)) diff --git a/code/modules/antagonists/blob/blob_minions/blob_spore.dm b/code/modules/antagonists/blob/blob_minions/blob_spore.dm index 59ad29b9560..e814e9e734e 100644 --- a/code/modules/antagonists/blob/blob_minions/blob_spore.dm +++ b/code/modules/antagonists/blob/blob_minions/blob_spore.dm @@ -59,12 +59,12 @@ stat_attack = DEAD . = ..() stat_attack = initial(stat_attack) - + /mob/living/simple_animal/hostile/blob_minion/spore/AttackingTarget() . = ..() var/mob/living/carbon/human/human_target = target - if (!istype(human_target) || human_target.stat != DEAD) + if(!istype(human_target) || human_target.stat != DEAD) return zombify(human_target) @@ -76,7 +76,7 @@ visible_message(span_warning("Тело [target.name] внезапно поднимается!")) var/mob/living/simple_animal/hostile/blob_minion/zombie/blombie = change_mob_type(zombie_type, loc, new_name = initial(zombie_type.name)) blombie.set_name() - if (istype(blombie)) // In case of badmin + if(istype(blombie)) // In case of badmin blombie.consume_corpse(target) SEND_SIGNAL(src, COMSIG_BLOB_ZOMBIFIED, blombie) qdel(src) @@ -95,9 +95,9 @@ /// When we z-move check that we're on the same z level as our factory was /mob/living/simple_animal/hostile/blob_minion/spore/minion/proc/on_z_changed() SIGNAL_HANDLER - if (isnull(z_turf)) + if(isnull(z_turf)) return - if (!is_valid_z_level(get_turf(src), z_turf)) + if(!is_valid_z_level(get_turf(src), z_turf)) death() /// Mark the turf we need to track from our factory @@ -107,7 +107,7 @@ /// If the blob changes to distributed neurons then you can control the spores /mob/living/simple_animal/hostile/blob_minion/spore/minion/on_strain_updated(mob/camera/blob/overmind, datum/blobstrain/new_strain) - if (istype(new_strain, /datum/blobstrain/reagent/distributed_neurons)) + if(istype(new_strain, /datum/blobstrain/reagent/distributed_neurons)) AddComponent(\ /datum/component/ghost_direct_control,\ ban_type = ROLE_BLOB,\ diff --git a/code/modules/antagonists/blob/blob_minions/blob_zombie.dm b/code/modules/antagonists/blob/blob_minions/blob_zombie.dm index 254a5553b5e..f1303f1a95b 100644 --- a/code/modules/antagonists/blob/blob_minions/blob_zombie.dm +++ b/code/modules/antagonists/blob/blob_minions/blob_zombie.dm @@ -33,7 +33,7 @@ /mob/living/simple_animal/hostile/blob_minion/zombie/Exited(atom/movable/gone, direction) . = ..() - if (gone != corpse) + if(gone != corpse) return corpse = null death() @@ -100,7 +100,7 @@ /mob/living/simple_animal/hostile/blob_minion/zombie/controlled/consume_corpse(mob/living/carbon/human/new_corpse) . = ..() - if (!isnull(client) || SSticker.current_state == GAME_STATE_FINISHED) + if(!isnull(client) || SSticker.current_state == GAME_STATE_FINISHED) return AddComponent(\ /datum/component/ghost_direct_control,\ diff --git a/code/modules/antagonists/blob/blob_minions/blobbernaut.dm b/code/modules/antagonists/blob/blob_minions/blobbernaut.dm index b9787042082..e0b742670a3 100644 --- a/code/modules/antagonists/blob/blob_minions/blobbernaut.dm +++ b/code/modules/antagonists/blob/blob_minions/blobbernaut.dm @@ -51,33 +51,33 @@ /mob/living/simple_animal/hostile/blob_minion/blobbernaut/minion/Initialize(mapload) bruteloss = maxHealth / 2 // Start out injured to encourage not beelining away from the blob . = ..() - + /mob/living/simple_animal/hostile/blob_minion/blobbernaut/minion/Life(seconds_per_tick, times_fired) . = ..() - if (!.) + if(!.) return FALSE var/damage_sources = 0 var/list/blobs_in_area = (is_there_multiz())? urange_multiz(2, src) : range(2, src) - if (!(locate(/obj/structure/blob) in blobs_in_area)) + if(!(locate(/obj/structure/blob) in blobs_in_area)) damage_sources++ - if (orphaned) + if(orphaned) damage_sources++ else var/particle_colour = atom_colours[FIXED_COLOUR_PRIORITY] || COLOR_BLACK - if (locate(/obj/structure/blob/special/core) in blobs_in_area) + if(locate(/obj/structure/blob/special/core) in blobs_in_area) heal_overall_damage(maxHealth * BLOBMOB_BLOBBERNAUT_HEALING_CORE * seconds_per_tick) var/obj/effect/temp_visual/heal/heal_effect = new /obj/effect/temp_visual/heal(get_turf(src)) heal_effect.color = particle_colour - if (locate(/obj/structure/blob/special/node) in blobs_in_area) + if(locate(/obj/structure/blob/special/node) in blobs_in_area) heal_overall_damage(maxHealth * BLOBMOB_BLOBBERNAUT_HEALING_NODE * seconds_per_tick) var/obj/effect/temp_visual/heal/heal_effect = new /obj/effect/temp_visual/heal(get_turf(src)) heal_effect.color = particle_colour - if (damage_sources == 0) + if(damage_sources == 0) return FALSE // take 2.5% of max health as damage when not near the blob or if the naut has no factory, 5% if both @@ -99,7 +99,7 @@ /// Set our attack damage based on blob's properties /mob/living/simple_animal/hostile/blob_minion/blobbernaut/minion/on_strain_updated(mob/camera/blob/overmind, datum/blobstrain/new_strain) - if (isnull(overmind)) + if(isnull(overmind)) melee_damage_lower = initial(melee_damage_lower) melee_damage_upper = initial(melee_damage_upper) attacktext = initial(attacktext) diff --git a/code/modules/antagonists/blob/blobstrains/_blobstrain.dm b/code/modules/antagonists/blob/blobstrains/_blobstrain.dm index de8752d280c..55031106c5c 100644 --- a/code/modules/antagonists/blob/blobstrains/_blobstrain.dm +++ b/code/modules/antagonists/blob/blobstrains/_blobstrain.dm @@ -64,7 +64,7 @@ GLOBAL_LIST_INIT(valid_blobstrains, subtypesof(/datum/blobstrain) - list(/datum/ var/blobbernaut_reagentatk_bonus = 0 /datum/blobstrain/New(mob/camera/blob/new_overmind) - if (!istype(new_overmind)) + if(!istype(new_overmind)) stack_trace("blobstrain created without overmind") overmind = new_overmind diff --git a/code/modules/antagonists/blob/blobstrains/debris_devourer.dm b/code/modules/antagonists/blob/blobstrains/debris_devourer.dm index 9b9fcf6992d..ce7a9780637 100644 --- a/code/modules/antagonists/blob/blobstrains/debris_devourer.dm +++ b/code/modules/antagonists/blob/blobstrains/debris_devourer.dm @@ -21,7 +21,7 @@ var/obj/structure/blob/special/core/core = overmind.blob_core for(var/i in 1 to 3) var/obj/item/I = pick(core.contents) - if (I && !QDELETED(I)) + if(I && !QDELETED(I)) I.forceMove(get_turf(spore)) I.throw_at(get_edge_target_turf(spore,pick(GLOB.alldirs)), 6, 5, spore, TRUE, FALSE, null, 3) @@ -33,9 +33,9 @@ /datum/blobstrain/debris_devourer/proc/debris_attack(atom/attacking, atom/source) var/obj/structure/blob/special/core/core = overmind.blob_core - if (prob(40 * DEBRIS_DENSITY)) // Pretend the items are spread through the blob and its mobs and not in the core. + if(prob(40 * DEBRIS_DENSITY)) // Pretend the items are spread through the blob and its mobs and not in the core. var/obj/item/I = length(core.contents) ? pick(core.contents) : null - if (!QDELETED(I)) + if(!QDELETED(I)) if(isobj(I)) I.obj_flags |= IGNORE_BLOB_ACT addtimer(CALLBACK(src, PROC_REF(remove_protection), I), BLOB_ACT_PROTECTION_TIME) @@ -55,17 +55,17 @@ /datum/blobstrain/debris_devourer/examine(mob/user) . = ..() var/obj/structure/blob/special/core/core = overmind.blob_core - if (isobserver(user)) + if(isobserver(user)) . += span_notice("Поглощенный мусор в настоящее время снижает получаемый урон на [round(max(min(DEBRIS_DENSITY, 10),0))]") else switch (round(max(min(DEBRIS_DENSITY, 10),0))) - if (0) + if(0) . += span_notice("В настоящее время поглощенного мусора недостаточно, чтобы уменьшить урон.") - if (1 to 3) + if(1 to 3) . += span_notice("Поглощенный мусор в настоящее время снижает получаемый урон на очень небольшую величину.") // these roughly correspond with force description strings - if (4 to 7) + if(4 to 7) . += span_notice("Поглощенный мусор в настоящее время незначительно снижает получаемый урон.") - if (8 to 10) + if(8 to 10) . += span_notice("Поглощенный мусор в настоящее время снижает получаемый урон на среднюю величину.") #undef DEBRIS_DENSITY diff --git a/code/modules/antagonists/blob/blobstrains/multiplex.dm b/code/modules/antagonists/blob/blobstrains/multiplex.dm index aaebf1d0526..0930da2eae0 100644 --- a/code/modules/antagonists/blob/blobstrains/multiplex.dm +++ b/code/modules/antagonists/blob/blobstrains/multiplex.dm @@ -5,9 +5,9 @@ /datum/blobstrain/multiplex/New(mob/camera/blob/new_overmind, list/blobstrains) . = ..() for (var/bt in blobstrains) - if (ispath(bt, /datum/blobstrain)) + if(ispath(bt, /datum/blobstrain)) src.blobstrains += new bt(overmind) - else if (istype(bt, /datum/blobstrain)) + else if(istype(bt, /datum/blobstrain)) var/datum/blobstrain/bts = bt bts.overmind = overmind src.blobstrains += bt @@ -28,7 +28,7 @@ /datum/blobstrain/multiplex/tesla_reaction(obj/structure/blob/B, power, coefficient = 1) //when the blob is hit by a tesla bolt, do this for (var/datum/blobstrain/bt in blobstrains) . += bt.tesla_reaction(B, power, coefficient*typeshare) - if (prob(. / length(blobstrains) * 100)) + if(prob(. / length(blobstrains) * 100)) return 1 /datum/blobstrain/multiplex/extinguish_reaction(obj/structure/blob/B, coefficient = 1) //when the blob is hit with water, do this diff --git a/code/modules/antagonists/blob/overmind.dm b/code/modules/antagonists/blob/overmind.dm index f1703934fa3..75218bad02e 100644 --- a/code/modules/antagonists/blob/overmind.dm +++ b/code/modules/antagonists/blob/overmind.dm @@ -112,7 +112,7 @@ GLOBAL_LIST_EMPTY(overminds) if(isturf(T)) update_z(T.z) - + /mob/camera/blob/Logout() update_z(null) . = ..() @@ -176,17 +176,17 @@ GLOBAL_LIST_EMPTY(overminds) bubble_type, sanitize = TRUE, ) - if (!message) + if(!message) return - if (client) + if(client) if(GLOB.admin_mutes_assoc[ckey] & MUTE_IC) to_chat(src, span_boldwarning("Вы не можете писать IC сообщения (мут).")) return - if (client.handle_spam_prevention(message, MUTE_IC)) + if(client.handle_spam_prevention(message, MUTE_IC)) return - if (stat) + if(stat) return blob_talk(message) @@ -195,7 +195,7 @@ GLOBAL_LIST_EMPTY(overminds) message = trim(copytext_char(sanitize(message), 1, MAX_MESSAGE_LEN)) - if (!message) + if(!message) return add_say_logs(src, message, language = "BLOB") @@ -216,11 +216,11 @@ GLOBAL_LIST_EMPTY(overminds) /mob/camera/blob/proc/set_strain(datum/blobstrain/new_strain, first_select = FALSE) - if (!ispath(new_strain)) + if(!ispath(new_strain)) return FALSE var/had_strain = FALSE - if (istype(blobstrain)) + if(istype(blobstrain)) blobstrain.on_lose() qdel(blobstrain) had_strain = TRUE @@ -231,7 +231,7 @@ GLOBAL_LIST_EMPTY(overminds) overmind_datum.strain = blobstrain blobstrain.on_gain() - if (had_strain && !first_select) + if(had_strain && !first_select) var/list/messages = get_strain_info() to_chat(src, chat_box_red(messages.Join("
"))) SEND_SIGNAL(src, COMSIG_BLOB_SELECTED_STRAIN, blobstrain) @@ -266,7 +266,7 @@ GLOBAL_LIST_EMPTY(overminds) /// Add something to our list of mobs and wait for it to die /mob/camera/blob/proc/register_new_minion(mob/living/minion) blob_mobs |= minion - if (!istype(minion, /mob/living/simple_animal/hostile/blob_minion/blobbernaut)) + if(!istype(minion, /mob/living/simple_animal/hostile/blob_minion/blobbernaut)) RegisterSignal(minion, COMSIG_LIVING_DEATH, PROC_REF(on_minion_death)) /// When a spore (or zombie) dies then we do this diff --git a/code/modules/antagonists/blob/powers.dm b/code/modules/antagonists/blob/powers.dm index 2abb74a324f..77f445b5467 100644 --- a/code/modules/antagonists/blob/powers.dm +++ b/code/modules/antagonists/blob/powers.dm @@ -180,7 +180,7 @@ /// When one of our boys attacked something, we sometimes want to perform extra effects /mob/camera/blob/proc/on_blobbernaut_attacked(mob/living/simple_animal/hostile/blobbynaut, atom/target, success) SIGNAL_HANDLER - if (!success) + if(!success) return if(!QDELETED(src)) blobstrain.blobbernaut_attack(target, blobbynaut) @@ -365,7 +365,7 @@ /** Opens the reroll menu to change strains */ /mob/camera/blob/proc/strain_reroll() - if (!free_strain_rerolls && blob_points < BLOB_POWER_REROLL_COST) + if(!free_strain_rerolls && blob_points < BLOB_POWER_REROLL_COST) to_chat(src, span_warning("Вам нужно как минимум [BLOB_POWER_REROLL_COST], чтобы снова изменить свой штамм!")) return FALSE @@ -373,7 +373,7 @@ /** Controls changing strains */ /mob/camera/blob/proc/open_reroll_menu() - if (!strain_choices) + if(!strain_choices) strain_choices = list() var/list/new_strains = GLOB.valid_blobstrains.Copy() - blobstrain.type @@ -385,24 +385,24 @@ //var/info_text = span_boldnotice("[initial(strain.name)]") //info_text += "
[span_notice("[initial(strain.analyzerdescdamage)]")]" - //if (!isnull(initial(strain.analyzerdesceffect))) + //if(!isnull(initial(strain.analyzerdesceffect))) //info_text += "
[span_notice("[initial(strain.analyzerdesceffect)]")]" strain_choices[initial(strain.name)] = strain_icon var/strain_result = show_radial_menu(src, src, strain_choices, radius = BLOB_REROLL_RADIUS) - if (isnull(strain_result)) + if(isnull(strain_result)) return - if (!free_strain_rerolls && !can_buy(BLOB_POWER_REROLL_COST)) + if(!free_strain_rerolls && !can_buy(BLOB_POWER_REROLL_COST)) return for (var/_other_strain in GLOB.valid_blobstrains) var/datum/blobstrain/other_strain = _other_strain - if (initial(other_strain.name) == strain_result) + if(initial(other_strain.name) == strain_result) set_strain(other_strain) - if (free_strain_rerolls) + if(free_strain_rerolls) free_strain_rerolls -= 1 last_reroll_time = world.time diff --git a/code/modules/antagonists/blob/structures/core.dm b/code/modules/antagonists/blob/structures/core.dm index d47a8d45030..f364a4d88fd 100644 --- a/code/modules/antagonists/blob/structures/core.dm +++ b/code/modules/antagonists/blob/structures/core.dm @@ -51,7 +51,7 @@ STOP_PROCESSING(SSobj, src) GLOB.poi_list.Remove(src) for(var/atom/movable/atom as anything in contents) - if (atom && !QDELETED(atom) && istype(atom)) + if(atom && !QDELETED(atom) && istype(atom)) atom.forceMove(get_turf(src)) atom.throw_at(get_edge_target_turf(src, pick(GLOB.alldirs)), 6, 5, src, TRUE, FALSE, null, 3) return ..() diff --git a/code/modules/antagonists/blob/structures/factory.dm b/code/modules/antagonists/blob/structures/factory.dm index 28f4c11c418..6c42e4c770b 100644 --- a/code/modules/antagonists/blob/structures/factory.dm +++ b/code/modules/antagonists/blob/structures/factory.dm @@ -81,7 +81,7 @@ /// Produce a blobbernaut /obj/structure/blob/special/factory/proc/assign_blobbernaut(mob/living/new_naut) is_creating_blobbernaut = FALSE - if (isnull(new_naut)) + if(isnull(new_naut)) return modify_max_integrity(initial(max_integrity) * 0.25) //factories that produced a blobbernaut have much lower health @@ -96,7 +96,7 @@ /// When our brave soldier dies, reset our max integrity /obj/structure/blob/special/factory/proc/on_blobbernaut_death(mob/living/death_naut) SIGNAL_HANDLER - if (isnull(blobbernaut) || blobbernaut != death_naut) + if(isnull(blobbernaut) || blobbernaut != death_naut) return blobbernaut = null max_integrity = initial(max_integrity) diff --git a/code/modules/antagonists/blob/structures/normal.dm b/code/modules/antagonists/blob/structures/normal.dm index f3e2e53d091..2538f64825a 100644 --- a/code/modules/antagonists/blob/structures/normal.dm +++ b/code/modules/antagonists/blob/structures/normal.dm @@ -43,7 +43,7 @@ if(compromised_integrity) brute_resist = BLOB_BRUTE_RESIST - else if (overmind) + else if(overmind) brute_resist = BLOB_BRUTE_RESIST * 0.5 else brute_resist = BLOB_BRUTE_RESIST * 0.5 diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 9d395c5ad58..2133ffa1ab2 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -1197,7 +1197,7 @@ GLOBAL_LIST_INIT(holy_areas, typecacheof(list( message_admins("[src] [ADMIN_FLW(src, "FLW")] has somehow ended up in Z-level [T.z] despite being registered in Z-level [registered_z]. If you could ask them how that happened and notify the coders, it would be appreciated.") add_misc_logs(src, "Z-TRACKING: [src] has somehow ended up in Z-level [T.z] despite being registered in Z-level [registered_z].") update_z(T.z) - else if (!client && registered_z) + else if(!client && registered_z) add_misc_logs(src, "Z-TRACKING: [src] of type [src.type] has a Z-registration despite not having a client.") update_z(null)