cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-11 18:22:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Replaces a portion of C-style for loops with the more commonplace for loops, which are faster. [MDB IGNORE] (#9298)

Browse Source 
* Replaces a portion of C-style for loops with the more commonplace for loops, which are faster.

* Update code/modules/projectiles/boxes_magazines/_box_magazine.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com>
This commit is contained in:
SkyratBot
2021-11-08 15:50:29 +00:00
committed by GitHub
parent f44a214a2f
commit 98428cdfb5
49 changed files with 124 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/objects/items/storage/secure.dm
View File

@@ -151,7 +151,7 @@
/obj/item/storage/secure/briefcase/syndie/PopulateContents()
..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
for(var/i = 0, i < STR.max_items - 2, i++)
for(var/i in 1 to STR.max_items - 2)
new /obj/item/stack/spacecash/c1000(src)

2
code/game/objects/items/tanks/watertank.dm
View File

@@ -316,7 +316,7 @@
var/obj/effect/resin_container/A = new (get_turf(src))
log_game("[key_name(user)] used Resin Launcher at [AREACOORD(user)].")
playsound(src,'sound/items/syringeproj.ogg',40,TRUE)
for(var/a=0, a<5, a++)
for(var/i in 1 to 5)
step_towards(A, target)
sleep(2)
A.Smoke()

20
code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
View File

@@ -36,7 +36,7 @@
/obj/structure/closet/secure_closet/freezer/kitchen/PopulateContents()
..()
for(var/i = 0, i < 3, i++)
for(var/i in 1 to 3)
new /obj/item/reagent_containers/food/condiment/flour(src)
new /obj/item/reagent_containers/food/condiment/rice(src)
new /obj/item/reagent_containers/food/condiment/sugar(src)
@@ -48,11 +48,10 @@
/obj/structure/closet/secure_closet/freezer/kitchen/maintenance/PopulateContents()
..()
for(var/i = 0, i < 5, i++)
for(var/i in 1 to 5)
new /obj/item/reagent_containers/food/condiment/milk(src)
for(var/i = 0, i < 5, i++)
new /obj/item/reagent_containers/food/condiment/soymilk(src)
for(var/i = 0, i < 2, i++)
for(var/i in 1 to 2)
new /obj/item/storage/fancy/egg_box(src)
/obj/structure/closet/secure_closet/freezer/kitchen/mining
@@ -64,7 +63,7 @@
/obj/structure/closet/secure_closet/freezer/meat/PopulateContents()
..()
for(var/i = 0, i < 4, i++)
for(var/i in 1 to 4)
new /obj/item/food/meat/slab/monkey(src)
/obj/structure/closet/secure_closet/freezer/meat/open
@@ -85,11 +84,10 @@
/obj/structure/closet/secure_closet/freezer/fridge/PopulateContents()
..()
for(var/i = 0, i < 5, i++)
for(var/i in 1 to 5)
new /obj/item/reagent_containers/food/condiment/milk(src)
for(var/i = 0, i < 5, i++)
new /obj/item/reagent_containers/food/condiment/soymilk(src)
for(var/i = 0, i < 2, i++)
for(var/i in 1 to 2)
new /obj/item/storage/fancy/egg_box(src)
/obj/structure/closet/secure_closet/freezer/fridge/open
@@ -103,11 +101,11 @@
/obj/structure/closet/secure_closet/freezer/money/PopulateContents()
..()
for(var/i = 0, i < 3, i++)
for(var/i in 1 to 3)
new /obj/item/stack/spacecash/c1000(src)
for(var/i = 0, i < 5, i++)
for(var/i in 1 to 5)
new /obj/item/stack/spacecash/c500(src)
for(var/i = 0, i < 6, i++)
for(var/i in 1 to 6)
new /obj/item/stack/spacecash/c200(src)
/obj/structure/closet/secure_closet/freezer/cream_pie

2
code/game/objects/structures/crates_lockers/closets/syndicate.dm
View File

@@ -117,7 +117,7 @@
/obj/item/stack/sheet/mineral/wood
)
for(var/i = 0, i<2, i++)
for(var/i in 1 to 2)
for(var/res in resources)
var/obj/item/stack/R = res
new res(src, initial(R.max_amount))

3
code/modules/admin/verbs/SDQL2/SDQL_2.dm
View File

@@ -983,7 +983,8 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/sdql2_vv_all, new(null
/proc/SDQL_testout(list/query_tree, indent = 0)
var/static/whitespace = "&nbsp;&nbsp;&nbsp; "
var/spaces = ""
for(var/s = 0, s < indent, s++)
if(indent > 0)
for(var/i in 1 to indent)
spaces += whitespace
for(var/item in query_tree)

2
code/modules/admin/verbs/adminhelp.dm
View File

@@ -779,7 +779,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
surname_found = i
break
//forenames
for(var/i=1, i<surname_found, i++)
for(var/i in 1 to surname_found-1)
var/word = ckey(L[i])
if(word)
forenames[word] = M

2
code/modules/antagonists/abductor/equipment/abduction_gear.dm
View File

@@ -759,7 +759,7 @@ Congratulations! You are now trained for invasive xenobiology research!"}
I.play_tool_sound(src)
if(I.use_tool(src, user, 30))
playsound(src, 'sound/items/deconstruct.ogg', 50, TRUE)
for(var/i = 1, i <= framestackamount, i++)
for(var/i in 0 to framestackamount)
new framestack(get_turf(src))
qdel(src)
return

6
code/modules/antagonists/abductor/machinery/dispenser.dm
View File

@@ -18,7 +18,7 @@
gland_types = shuffle(gland_types)
gland_colors = new/list(gland_types.len)
amounts = new/list(gland_types.len)
for(var/i=1,i<=gland_types.len,i++)
for(var/i in 1 to gland_types.len)
gland_colors[i] = random_color()
amounts[i] = rand(1,5)
@@ -39,7 +39,7 @@
/obj/machinery/abductor/gland_dispenser/ui_data(mob/user)
var/list/data = list()
data["glands"] = list()
for(var/gland_number=1,gland_number<=gland_colors.len,gland_number++)
for(var/gland_number in 1 to gland_colors.len)
var/list/gland_information = list(
"color" = gland_colors[gland_number],
"amount" = amounts[gland_number],
@@ -65,7 +65,7 @@
if(istype(W, /obj/item/organ/heart/gland))
if(!user.transferItemToLoc(W, src))
return
for(var/i=1,i<=gland_colors.len,i++)
for(var/i in 1 to gland_colors.len)
if(gland_types[i] == W.type)
amounts[i]++
else

2
code/modules/antagonists/eldritch_cult/eldritch_magic.dm
View File

@@ -413,7 +413,7 @@
/obj/effect/proc_holder/spell/aoe_turf/fire_cascade/proc/fire_cascade(atom/centre,max_range)
playsound(get_turf(centre), 'sound/items/welder.ogg', 75, TRUE)
var/_range = 1
for(var/i = 0, i <= max_range,i++)
for(var/i in 0 to max_range)
for(var/turf/T in spiral_range_turfs(_range,centre))
new /obj/effect/hotspot(T)
T.hotspot_expose(700,50,1)

2
code/modules/antagonists/gang/handler.dm
View File

@@ -161,7 +161,7 @@ GLOBAL_VAR(families_override_theme)
log_game("[gangbanger] was not a human, and thus has lost their gangster role.")
replacement_gangsters++
if(replacement_gangsters)
for(var/j = 0, j < replacement_gangsters, j++)
for(var/j in 1 to replacement_gangsters)
if(!antag_candidates.len)
log_game("Unable to find more replacement gangsters. Not all of the gangs will spawn.")
break

2
code/modules/antagonists/traitor/equipment/contractor.dm
View File

@@ -77,7 +77,7 @@
start_index = assigned_contracts.len + 1
// Generate contracts, and find the lowest paying.
for (var/i = 1; i <= to_generate.len; i++)
for(var/i in 1 to to_generate.len)
var/datum/syndicate_contract/contract_to_add = new(owner, assigned_targets, to_generate[i])
var/contract_payout_total = contract_to_add.contract.payout + contract_to_add.contract.payout_bonus

2
code/modules/clothing/shoes/_shoes.dm
View File

@@ -35,7 +35,7 @@
return BRUTELOSS
else//didnt realize this suicide act existed (was in miscellaneous.dm) and didnt want to remove it, so made it a 50/50 chance. Why not!
user.visible_message(span_suicide("[user] is bashing [user.p_their()] own head in with [src]! Ain't that a kick in the head?"))
for(var/i = 0, i < 3, i++)
for(var/i in 1 to 3)
sleep(3)
playsound(user, 'sound/weapons/genhit2.ogg', 50, TRUE)
return(BRUTELOSS)

2
code/modules/events/electrical_storm.dm
View File

@@ -18,7 +18,7 @@
/datum/round_event/electrical_storm/start()
var/list/epicentreList = list()
for(var/i=1, i <= lightsoutAmount, i++)
for(var/i in 1 to lightsoutAmount)
var/turf/T = find_safe_turf()
if(istype(T))
epicentreList += T

4
code/modules/events/fake_virus.dm
View File

@@ -14,7 +14,7 @@
//first we do hard status effect victims
var/defacto_min = min(3, LAZYLEN(fake_virus_victims))
if(defacto_min)// event will hit 1-3 people by default, but will do 1-2 or just 1 if only those many candidates are available
for(var/i=1; i<=rand(1,defacto_min); i++)
for(var/i in 1 to rand(1,defacto_min))
var/mob/living/carbon/human/hypochondriac = pick(fake_virus_victims)
hypochondriac.apply_status_effect(STATUS_EFFECT_FAKE_VIRUS)
fake_virus_victims -= hypochondriac
@@ -23,7 +23,7 @@
//then we do light one-message victims who simply cough or whatever once (have to repeat the process since the last operation modified our candidates list)
defacto_min = min(5, LAZYLEN(fake_virus_victims))
if(defacto_min)
for(var/i=1; i<=rand(1,defacto_min); i++)
for(var/i in 1 to rand(1,defacto_min))
var/mob/living/carbon/human/onecoughman = pick(fake_virus_victims)
if(prob(25))//1/4 odds to get a spooky message instead of coughing out loud
addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, onecoughman, span_warning("[pick("Your head hurts.", "Your head pounds.")]")), rand(30,150))

2
code/modules/events/shuttle_loan.dm
View File

@@ -165,7 +165,7 @@
if(ANTIDOTE_NEEDED)
var/obj/effect/mob_spawn/human/corpse/assistant/infected_assistant = pick(/obj/effect/mob_spawn/human/corpse/assistant/beesease_infection, /obj/effect/mob_spawn/human/corpse/assistant/brainrot_infection, /obj/effect/mob_spawn/human/corpse/assistant/spanishflu_infection)
var/turf/T
for(var/i=0, i<10, i++)
for(var/i in 1 to 10)
if(prob(15))
shuttle_spawns.Add(/obj/item/reagent_containers/glass/bottle)
else if(prob(15))

2
code/modules/events/wormholes.dm
View File

@@ -26,7 +26,7 @@ GLOBAL_LIST_EMPTY(all_wormholes) // So we can pick wormholes to teleport to
if(is_station_level(T.z))
pick_turfs += T
for(var/i = 1, i <= number_of_wormholes, i++)
for(var/i in 1 to number_of_wormholes)
var/turf/T = pick(pick_turfs)
wormholes += new /obj/effect/portal/wormhole(T, 0, null, FALSE)

16
code/modules/food_and_drinks/recipes/food_mixtures.dm
View File

@@ -26,7 +26,7 @@
/datum/chemical_reaction/food/tofu/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
for(var/i in 1 to created_volume)
new /obj/item/food/tofu(location)
return
@@ -44,7 +44,7 @@
/datum/chemical_reaction/food/chocolate_bar/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
for(var/i in 1 to created_volume)
new /obj/item/food/chocolatebar(location)
return
@@ -55,7 +55,7 @@
/datum/chemical_reaction/food/chocolate_bar2/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
for(var/i in 1 to created_volume)
new /obj/item/food/chocolatebar(location)
return
@@ -65,7 +65,7 @@
/datum/chemical_reaction/food/chocolate_bar3/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
for(var/i in 1 to created_volume)
new /obj/item/food/chocolatebar(location)
return
@@ -100,7 +100,7 @@
/datum/chemical_reaction/food/cheesewheel/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
for(var/i in 1 to created_volume)
new /obj/item/food/cheese/wheel(location)
/datum/chemical_reaction/food/synthmeat
@@ -110,7 +110,7 @@
/datum/chemical_reaction/food/synthmeat/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
for(var/i in 1 to created_volume)
new /obj/item/food/meat/slab/synthmeat(location)
/datum/chemical_reaction/food/hot_ramen
@@ -144,7 +144,7 @@
/datum/chemical_reaction/food/dough/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
for(var/i in 1 to created_volume)
new /obj/item/food/dough(location)
/datum/chemical_reaction/food/cakebatter
@@ -154,7 +154,7 @@
/datum/chemical_reaction/food/cakebatter/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
for(var/i in 1 to created_volume)
new /obj/item/food/cakebatter(location)
/datum/chemical_reaction/food/cakebatter/vegan

2
code/modules/hydroponics/grown/replicapod.dm
View File

@@ -171,7 +171,7 @@
if(prob(getYield() * 20))
seed_count++
var/output_loc = parent.Adjacent(user) ? user.loc : parent.loc //needed for TK
for(var/i=0,i<seed_count,i++)
for(var/i in 1 to seed_count)
var/obj/item/seeds/replicapod/harvestseeds = src.Copy()
result.Add(harvestseeds)
harvestseeds.forceMove(output_loc)

8
code/modules/mapping/space_management/space_transition.dm
View File

@@ -68,10 +68,10 @@
var/list/point_grid[conf_set_len*2+1][conf_set_len*2+1]
var/list/grid = list()
var/datum/space_transition_point/P
for(var/i = 1, i<=conf_set_len*2+1, i++)
for(var/j = 1, j<=conf_set_len*2+1, j++)
P = new/datum/space_transition_point(i,j, point_grid)
point_grid[i][j] = P
for(var/x in 1 to conf_set_len*2+1)
for(var/y in 1 to conf_set_len*2+1)
P = new/datum/space_transition_point(x, y, point_grid)
point_grid[x][y] = P
grid.Add(P)
for(var/datum/space_transition_point/pnt in grid)
pnt.set_neigbours(point_grid)

2
code/modules/meteors/meteors.dm
View File

@@ -24,7 +24,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
///////////////////////////////
/proc/spawn_meteors(number = 10, list/meteortypes)
for(var/i = 0; i < number; i++)
for(var/i in 1 to number)
spawn_meteor(meteortypes)
/proc/spawn_meteor(list/meteortypes)

2
code/modules/mining/abandoned_crates.dm
View File

@@ -20,7 +20,7 @@
. = ..()
var/list/digits = list("1", "2", "3", "4", "5", "6", "7", "8", "9", "0")
code = ""
for(var/i = 0, i < codelen, i++)
for(var/i in 1 to codelen)
var/dig = pick(digits)
code += dig
digits -= dig //there are never matching digits in the answer

2
code/modules/mob/living/carbon/carbon.dm
View File

@@ -386,7 +386,7 @@
if(31 to 60) //Throw object in facing direction
var/turf/target = get_turf(loc)
var/range = rand(2,I.throw_range)
for(var/i = 1; i < range; i++)
for(var/i in 1 to range-1)
var/turf/new_turf = get_step(target, dir)
target = new_turf
if(new_turf.density)

6
code/modules/mob/living/carbon/human/species_types/golems.dm
View File

@@ -414,7 +414,7 @@
H.visible_message(span_danger("[H] turns into a pile of sand!"))
for(var/obj/item/W in H)
H.dropItemToGround(W)
for(var/i=1, i <= rand(3,5), i++)
for(var/i in 1 to rand(3,5))
new /obj/item/stack/ore/glass(get_turf(H))
qdel(H)
@@ -446,7 +446,7 @@
H.visible_message(span_danger("[H] shatters!"))
for(var/obj/item/W in H)
H.dropItemToGround(W)
for(var/i=1, i <= rand(3,5), i++)
for(var/i in 1 to rand(3,5))
new /obj/item/shard(get_turf(H))
qdel(H)
@@ -1210,7 +1210,7 @@
H.visible_message(span_danger("[H] turns into a pile of snow!"))
for(var/obj/item/W in H)
H.dropItemToGround(W)
for(var/i=1, i <= rand(3,5), i++)
for(var/i in 1 to rand(3,5))
new /obj/item/stack/sheet/mineral/snow(get_turf(H))
new /obj/item/food/grown/carrot(get_turf(H))
qdel(H)

8
code/modules/mob/living/silicon/robot/laws.dm
View File

@@ -41,13 +41,13 @@
var/temp
if (master)
laws.ion.len = master.ion.len
for (var/index = 1, index <= master.ion.len, index++)
for (var/index in 1 to master.ion.len)
temp = master.ion[index]
if (length(temp) > 0)
laws.ion[index] = temp
laws.hacked.len = master.hacked.len
for (var/index = 1, index <= master.hacked.len, index++)
for (var/index in 1 to master.hacked.len)
temp = master.hacked[index]
if (length(temp) > 0)
laws.hacked[index] = temp
@@ -59,13 +59,13 @@
laws.zeroth = temp
laws.inherent.len = master.inherent.len
for (var/index = 1, index <= master.inherent.len, index++)
for (var/index in 1 to master.inherent.len)
temp = master.inherent[index]
if (length(temp) > 0)
laws.inherent[index] = temp
laws.supplied.len = master.supplied.len
for (var/index = 1, index <= master.supplied.len, index++)
for (var/index in 1 to master.supplied.len)
temp = master.supplied[index]
if (length(temp) > 0)
laws.supplied[index] = temp

8
code/modules/mob/living/silicon/silicon.dm
View File

@@ -253,7 +253,7 @@
lawcheck[1] = "No" //Given Law 0's usual nature, it defaults to NOT getting reported. --NeoFite
list += {"<A href='byond://?src=[REF(src)];lawc=0'>[lawcheck[1]] 0:</A> <font color='#ff0000'><b>[laws.zeroth]</b></font><BR>"}
for (var/index = 1, index <= laws.hacked.len, index++)
for (var/index in 1 to laws.hacked.len)
var/law = laws.hacked[index]
if (length(law) > 0)
if (!hackedcheck[index])
@@ -261,7 +261,7 @@
list += {"<A href='byond://?src=[REF(src)];lawh=[index]'>[hackedcheck[index]] [ion_num()]:</A> <font color='#660000'>[law]</font><BR>"}
hackedcheck.len += 1
for (var/index = 1, index <= laws.ion.len, index++)
for (var/index in 1 to laws.ion.len)
var/law = laws.ion[index]
if (length(law) > 0)
@@ -271,7 +271,7 @@
ioncheck.len += 1
var/number = 1
for (var/index = 1, index <= laws.inherent.len, index++)
for (var/index in 1 to laws.inherent.len)
var/law = laws.inherent[index]
if (length(law) > 0)
@@ -282,7 +282,7 @@
list += {"<A href='byond://?src=[REF(src)];lawc=[number]'>[lawcheck[number+1]] [number]:</A> [law]<BR>"}
number++
for (var/index = 1, index <= laws.supplied.len, index++)
for (var/index in 1 to laws.supplied.len)
var/law = laws.supplied[index]
if (length(law) > 0)
lawcheck.len += 1

4
code/modules/mob/living/simple_animal/bot/bot.dm
View File

@@ -531,8 +531,8 @@ Pass a positive integer as an argument to override a bot's default speed.
var/step_count = move_speed ? move_speed : base_speed //If a value is passed into move_speed, use that instead of the default speed var.
if(step_count >= 1 && tries < BOT_STEP_MAX_RETRIES)
for(var/step_number = 0, step_number < step_count,step_number++)
addtimer(CALLBACK(src, .proc/bot_step), BOT_STEP_DELAY*step_number)
for(var/step_number in 1 to step_count)
addtimer(CALLBACK(src, .proc/bot_step), BOT_STEP_DELAY*(step_number-1))
else
return FALSE
return TRUE

2
code/modules/mob/living/simple_animal/slime/powers.dm
View File

@@ -177,7 +177,7 @@
var/new_powerlevel = round(powerlevel / 4)
var/turf/drop_loc = drop_location()
for(var/i=1,i<=4,i++)
for(var/i in 1 to 4)
var/child_colour
if(mutation_chance >= 100)
child_colour = "rainbow"

2
code/modules/mob/transform_procs.dm
View File

@@ -222,7 +222,7 @@
if(reproduce)
var/number = pick(14;2,3,4) //reproduce (has a small chance of producing 3 or 4 offspring)
var/list/babies = list()
for(var/i=1,i<=number,i++)
for(var/i in 1 to number)
var/mob/living/simple_animal/slime/M = new/mob/living/simple_animal/slime(loc)
M.set_nutrition(round(nutrition/number))
step_away(M,src)

2
code/modules/power/lighting/light.dm
View File

@@ -446,7 +446,7 @@
return
flickering = TRUE
if(on && status == LIGHT_OK)
for(var/i = 0; i < amount; i++)
for(var/i in 1 to amount)
if(status != LIGHT_OK)
break
on = !on

2
code/modules/procedural_mapping/mapGenerator.dm
View File

@@ -69,7 +69,7 @@
if(bigZ % 2 == 0)
offByOneOffset = 0
for(var/i = lilZ, i <= bigZ+offByOneOffset, i++)
for(var/i in lilZ to bigZ+offByOneOffset)
var/theRadius = radius
if(i != sphereMagic)
theRadius = max(radius/max((2*abs(sphereMagic-i)),1),1)

38
code/modules/procedural_mapping/mapGenerators/cellular.dm
View File

@@ -30,10 +30,10 @@
/datum/map_generator/ca/proc/initialize()
old_state = new/list(width)
for(var/i = 1,i<=width,i++)
old_state[i] = new/list(height)
for(var/j = 1,j<=height,j++)
old_state[i][j] = rand(0,1)
for(var/x in 1 to width)
old_state[x] = new/list(height)
for(var/y in 1 to height)
old_state[x][y] = rand(0,1)
current_state = old_state.Copy()
@@ -42,25 +42,25 @@
//Maybe some less basic implemetation later, but this is just simple admin tool
initialize()
for(var/generation = 0,generation<iterations,generation++)
for(var/i = 1,i<=width,i++)
for(var/j = 1,j<=height,j++)
current_state[i][j] = apply_rule(i,j)
for(var/generation in 1 to iterations)
for(var/x in 1 to width)
for(var/y in 1 to height)
current_state[x][y] = apply_rule(x, y)
//copy state over
old_state = current_state.Copy()
for(var/i=1,i<=width,i++)
for(var/j=1,j<=height,j++)
var/turf/T = locate(start.x+i-1,start.y+j-1,start.z)
for(var/x in 1 to width)
for(var/y in 1 to height)
var/turf/T = locate(start.x+x-1,start.y+y-1,start.z)
if(T)
T.ChangeTurf(type_map[current_state[i][j]+1])
T.ChangeTurf(type_map[current_state[x][y]+1])
/datum/map_generator/ca/proc/apply_rule(i,j)
/datum/map_generator/ca/proc/apply_rule(x, y)
var/value = 0
for(var/dx=-1,dx<=1,dx++)
for(var/dy=-1,dy<=1,dy++)
var/n_x = i+dx
var/n_y = j+dy
for(var/dist_x in -1 to 1)
for(var/dist_y in -1 to 1)
var/n_x = x+dist_x
var/n_y = y+dist_y
if(n_x < 1 || n_x > width || n_y <1 || n_y > height)
if(loop_edges)
if(n_x < 1)
@@ -75,12 +75,12 @@
value += edge_value
continue
value += old_state[n_x][n_y]
value -= old_state[i][j]
value -= old_state[x][y]
if(value in b_rule)
return 1
if(value in s_rule)
return old_state[i][j]
return old_state[x][y]
return 0
/datum/map_generator/ca/caves

2
code/modules/projectiles/boxes_magazines/_box_magazine.dm
View File

@@ -75,7 +75,7 @@
stack_trace("Tried loading unsupported ammocasing type [load_type] into ammo box [type].")
return
for(var/i = max(1, stored_ammo.len), i <= max_ammo, i++)
for(var/i in max(1, stored_ammo.len) to max_ammo)
stored_ammo += new round_check() //SKYRAT EDTI CHANGE - SEC_HUAL - Moving to nullspace seems to help with lag.
update_ammo_count()

2
code/modules/projectiles/boxes_magazines/internal/_cylinder.dm
View File

@@ -55,7 +55,7 @@
if(!load_type)
load_type = ammo_type
for(var/i = 1, i <= max_ammo, i++)
for(var/i in 1 to max_ammo)
if(!give_round(new load_type(src)))
break
update_appearance()

2
code/modules/projectiles/guns/energy.dm
View File

@@ -100,7 +100,7 @@
/obj/item/gun/energy/proc/update_ammo_types()
var/obj/item/ammo_casing/energy/shot
for (var/i = 1, i <= ammo_type.len, i++)
for (var/i in 1 to ammo_type.len)
var/shottype = ammo_type[i]
shot = new shottype(src)
ammo_type[i] = shot

2
code/modules/reagents/chem_splash.dm
View File

@@ -37,7 +37,7 @@
var/list/viewable = view(affected_range, epicenter)
var/list/accessible = list(epicenter)
for(var/i=1; i<=affected_range; i++)
for(var/i in 1 to affected_range)
var/list/turflist = list()
for(var/turf/T in (orange(i, epicenter) - orange(i-1, epicenter)))
turflist |= T

12
code/modules/reagents/chemistry/machinery/chem_master.dm
View File

@@ -366,8 +366,8 @@
if(STRB)
drop_threshold = STRB.max_items - bottle.contents.len
target_loc = bottle
for(var/i = 0; i < amount; i++)
if(i < drop_threshold)
for(var/i in 1 to amount)
if(i-1 < drop_threshold)
P = new/obj/item/reagent_containers/pill(target_loc)
else
P = new/obj/item/reagent_containers/pill(drop_location())
@@ -383,7 +383,7 @@
return TRUE
if(item_type == "patch")
var/obj/item/reagent_containers/pill/patch/P
for(var/i = 0; i < amount; i++)
for(var/i in 1 to amount)
P = new/obj/item/reagent_containers/pill/patch(drop_location())
P.name = trim("[name] patch")
adjust_item_drop_location(P)
@@ -391,7 +391,7 @@
return TRUE
if(item_type == "bottle")
var/obj/item/reagent_containers/glass/bottle/P
for(var/i = 0; i < amount; i++)
for(var/i in 1 to amount)
P = new/obj/item/reagent_containers/glass/bottle(drop_location())
P.name = trim("[name] bottle")
adjust_item_drop_location(P)
@@ -408,7 +408,7 @@
return TRUE
if(item_type == "condimentPack")
var/obj/item/reagent_containers/food/condiment/pack/P
for(var/i = 0; i < amount; i++)
for(var/i in 1 to amount)
P = new/obj/item/reagent_containers/food/condiment/pack(drop_location())
P.originalname = name
P.name = trim("[name] pack")
@@ -417,7 +417,7 @@
return TRUE
if(item_type == "condimentBottle")
var/obj/item/reagent_containers/food/condiment/P
for(var/i = 0; i < amount; i++)
for(var/i in 1 to amount)
P = new/obj/item/reagent_containers/food/condiment(drop_location())
if (style)
apply_condi_style(P, style)

2
code/modules/reagents/chemistry/recipes.dm
View File

@@ -265,7 +265,7 @@
spawned_mob = new mob_class(get_turf(holder.my_atom))//Spawn our specific mob_class
spawned_mob.faction |= mob_faction
if(prob(50))
for(var/j = 1, j <= rand(1, 3), j++)
for(var/j in 1 to rand(1, 3))
step(spawned_mob, pick(NORTH,SOUTH,EAST,WEST))
/**

6
code/modules/reagents/chemistry/recipes/drugs.dm
View File

@@ -128,7 +128,7 @@
/datum/chemical_reaction/moon_rock/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
for(var/i in 1 to created_volume)
var/obj/item/food/drug/moon_rock/new_rock = new(location)
new_rock.pixel_x = rand(-6, 6)
new_rock.pixel_y = rand(-6, 6)
@@ -140,7 +140,7 @@
/datum/chemical_reaction/blastoff_ampoule/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume)
var/location = get_turf(holder.my_atom)
for(var/iteration = 1, iteration <= created_volume, iteration++)
for(var/iteration in 1 to created_volume)
var/obj/item/reagent_containers/glass/blastoff_ampoule/new_ampoule = new(location)
new_ampoule.pixel_x = rand(-6, 6)
new_ampoule.pixel_y = rand(-6, 6)
@@ -152,7 +152,7 @@
/datum/chemical_reaction/saturnx_glob/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume)
var/location = get_turf(holder.my_atom)
for(var/iteration = 1, iteration <= created_volume, iteration++)
for(var/iteration in 1 to created_volume)
var/obj/item/food/drug/saturnx/new_glob = new(location)
new_glob.pixel_x = rand(-6, 6)
new_glob.pixel_y = rand(-6, 6)

4
code/modules/reagents/chemistry/recipes/medicine.dm
View File

@@ -355,7 +355,7 @@
/datum/chemical_reaction/medicine/medsuture/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
for(var/i in 1 to created_volume)
new /obj/item/stack/medical/suture/medicated(location)
/datum/chemical_reaction/medicine/medmesh
@@ -364,7 +364,7 @@
/datum/chemical_reaction/medicine/medmesh/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
for(var/i in 1 to created_volume)
new /obj/item/stack/medical/mesh/advanced(location)
/datum/chemical_reaction/medicine/poultice

18
code/modules/reagents/chemistry/recipes/others.dm
View File

@@ -53,7 +53,7 @@
/datum/chemical_reaction/plasma_solidification/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
for(var/i in 1 to created_volume)
new /obj/item/stack/sheet/mineral/plasma(location)
/datum/chemical_reaction/gold_solidification
@@ -64,7 +64,7 @@
/datum/chemical_reaction/gold_solidification/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
for(var/i in 1 to created_volume)
new /obj/item/stack/sheet/mineral/gold(location)
/datum/chemical_reaction/uranium_solidification
@@ -75,7 +75,7 @@
/datum/chemical_reaction/uranium_solidification/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
for(var/i in 1 to created_volume)
new /obj/item/stack/sheet/mineral/uranium(location)
/datum/chemical_reaction/capsaicincondensation
@@ -92,7 +92,7 @@
/datum/chemical_reaction/soapification/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
for(var/i in 1 to created_volume)
new /obj/item/soap/homemade(location)
/datum/chemical_reaction/omegasoapification
@@ -106,7 +106,7 @@
/datum/chemical_reaction/omegasoapification/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
for(var/i in 1 to created_volume)
new /obj/item/soap/omega(location)
/datum/chemical_reaction/candlefication
@@ -118,7 +118,7 @@
/datum/chemical_reaction/candlefication/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
for(var/i in 1 to created_volume)
new /obj/item/candle(location)
/datum/chemical_reaction/meatification
@@ -129,7 +129,7 @@
/datum/chemical_reaction/meatification/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
for(var/i in 1 to created_volume)
new /obj/item/food/meat/slab/meatproduct(location)
return
@@ -559,7 +559,7 @@
/datum/chemical_reaction/corgium/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = rand(1, created_volume), i <= created_volume, i++) // More lulz.
for(var/i in rand(1, created_volume) to created_volume) // More lulz.
new /mob/living/simple_animal/pet/dog/corgi(location)
..()
@@ -598,7 +598,7 @@
/datum/chemical_reaction/butterflium/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = rand(1, created_volume), i <= created_volume, i++)
for(var/i in rand(1, created_volume) to created_volume)
new /mob/living/simple_animal/butterfly(location)
..()
//scream powder

2
code/modules/reagents/reagent_containers/spray.dm
View File

@@ -359,7 +359,7 @@
var/turf/T2 = get_step(T,turn(direction, -90))
var/list/the_targets = list(T,T1,T2)
for(var/i=1, i<=3, i++) // intialize sprays
for(var/i in 1 to 3) // intialize sprays
if(reagents.total_volume < 1)
return
..(the_targets[i], user)

4
code/modules/research/xenobiology/crossbreeding/burning.dm
View File

@@ -137,7 +137,7 @@ Burning extracts:
var/list/turfs = list()
for(var/turf/open/T in range(1,get_turf(user)))
turfs += T
for(var/i = 0, i < amount, i++)
for(var/i in 1 to amount)
var/path = get_random_food()
var/obj/item/O = new path(pick(turfs))
O.reagents.add_reagent(/datum/reagent/toxin/slimejelly,5) //Oh god it burns
@@ -250,7 +250,7 @@ Burning extracts:
var/mob/living/spawned_mob = create_random_mob(get_turf(user), HOSTILE_SPAWN)
spawned_mob.faction |= "[REF(user)]"
if(prob(50))
for(var/j = 1, j <= rand(1, 3), j++)
for(var/j in 1 to rand(1, 3))
step(spawned_mob, pick(NORTH,SOUTH,EAST,WEST))
..()

2
code/modules/research/xenobiology/crossbreeding/industrial.dm
View File

@@ -42,7 +42,7 @@ Industrial extracts:
if(plasmaabsorbed >= plasmarequired)
playsound(src, 'sound/effects/attackblob.ogg', 50, TRUE)
plasmaabsorbed -= plasmarequired
for(var/i = 0, i < itemamount, i++)
for(var/i in 1 to itemamount)
do_after_spawn(new itempath(get_turf(src)))
else if(IsWorking)
playsound(src, 'sound/effects/bubbles.ogg', 5, TRUE)

2
code/modules/research/xenobiology/crossbreeding/selfsustaining.dm
View File

@@ -18,7 +18,7 @@ Self-sustaining extracts:
/obj/item/slimecross/selfsustaining/Initialize(mapload)
..()
visible_message(span_warning("The [src] shudders, and splits into four smaller extracts."))
for(var/i = 0, i < 4, i++)
for(var/i in 1 to 4)
var/obj/item/autoslime/A = new /obj/item/autoslime(src.loc)
var/obj/item/slime_extract/X = new extract_type(A)
A.extract = X

16
code/modules/ruins/spaceruin_code/hilbertshotel.dm
View File

@@ -121,11 +121,11 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
var/datum/turf_reservation/roomReservation = SSmapping.RequestBlockReservation(hotelRoomTemp.width, hotelRoomTemp.height)
hotelRoomTempEmpty.load(locate(roomReservation.bottom_left_coords[1], roomReservation.bottom_left_coords[2], roomReservation.bottom_left_coords[3]))
var/turfNumber = 1
for(var/i=0, i<hotelRoomTemp.width, i++)
for(var/j=0, j<hotelRoomTemp.height, j++)
for(var/x in 0 to hotelRoomTemp.width-1)
for(var/y in 0 to hotelRoomTemp.height-1)
for(var/atom/movable/A in storedRooms["[roomNumber]"][turfNumber])
if(istype(A.loc, /obj/item/abstracthotelstorage))//Don't want to recall something thats been moved
A.forceMove(locate(roomReservation.bottom_left_coords[1] + i, roomReservation.bottom_left_coords[2] + j, roomReservation.bottom_left_coords[3]))
A.forceMove(locate(roomReservation.bottom_left_coords[1] + x, roomReservation.bottom_left_coords[2] + y, roomReservation.bottom_left_coords[3]))
turfNumber++
for(var/obj/item/abstracthotelstorage/S in storageTurf)
if((S.roomNumber == roomNumber) && (S.parentSphere == src))
@@ -166,8 +166,8 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
if(activeRooms.len)
for(var/x in activeRooms)
var/datum/turf_reservation/room = activeRooms[x]
for(var/i=0, i<hotelRoomTemp.width, i++)
for(var/j=0, j<hotelRoomTemp.height, j++)
for(var/i in 0 to hotelRoomTemp.width-1)
for(var/j in 0 to hotelRoomTemp.height-1)
for(var/atom/movable/A in locate(room.bottom_left_coords[1] + i, room.bottom_left_coords[2] + j, room.bottom_left_coords[3]))
if(ismob(A))
var/mob/M = A
@@ -418,10 +418,10 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
storageObj.roomNumber = roomnumber
storageObj.parentSphere = parentSphere
storageObj.name = "Room [roomnumber] Storage"
for(var/i=0, i<parentSphere.hotelRoomTemp.width, i++)
for(var/j=0, j<parentSphere.hotelRoomTemp.height, j++)
for(var/x in 0 to parentSphere.hotelRoomTemp.width-1)
for(var/y in 0 to parentSphere.hotelRoomTemp.height-1)
var/list/turfContents = list()
for(var/atom/movable/A in locate(reservation.bottom_left_coords[1] + i, reservation.bottom_left_coords[2] + j, reservation.bottom_left_coords[3]))
for(var/atom/movable/A in locate(reservation.bottom_left_coords[1] + x, reservation.bottom_left_coords[2] + y, reservation.bottom_left_coords[3]))
if(ismob(A) && !isliving(A))
continue //Don't want to store ghosts
turfContents += A

2
code/modules/spells/spell.dm
View File

@@ -475,7 +475,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
if(!can_target(target, user, TRUE))
continue
possible_targets += target
for(var/i=1,i<=max_targets,i++)
for(var/i in 1 to max_targets)
if(!possible_targets.len)
break
if(target_ignore_prev)

2
code/modules/spells/spell_types/conjure.dm
View File

@@ -23,7 +23,7 @@
if(T.density && !summon_ignore_density)
targets -= T
for(var/i=0,i<summon_amt,i++)
for(var/i in 1 to summon_amt)
if(!targets.len)
break
var/summoned_object_type = pick(summon_type)

2
code/modules/spells/spell_types/projectile.dm
View File

@@ -122,7 +122,7 @@
/obj/effect/proc_holder/spell/targeted/projectile/dumbfire/choose_targets(mob/user = usr)
var/turf/T = get_turf(user)
for(var/i = 1; i < range; i++)
for(var/i in 1 to range-1)
var/turf/new_turf = get_step(T, user.dir)
if(new_turf.density)
break

2
code/modules/vending/_vending.dm
View File

@@ -566,7 +566,7 @@ GLOBAL_LIST_EMPTY(vending_products)
span_userdanger("You are pinned down by [src]!"))
if(3) // glass candy
crit_rebate = 50
for(var/i = 0, i < num_shards, i++)
for(var/i in 1 to num_shards)
var/obj/item/shard/shard = new /obj/item/shard(get_turf(C))
shard.embedding = list(embed_chance = 100, ignore_throwspeed_threshold = TRUE, impact_pain_mult=1, pain_chance=5)
shard.updateEmbedding()