Skip to content

Commit 2886fc8

Browse files
authored
removes empty for blocks; fixes parsing for od (#11179)
some bizarre-world errors mostly whitespace changes but impactful so review with whitespace on helps to fix ci fails on OpenDreamProject/OpenDream#2454 --------- Co-authored-by: harryob <55142896+harryob@users.noreply.github.com>
1 parent 764d25d commit 2886fc8

File tree

4 files changed

+2
-13
lines changed

4 files changed

+2
-13
lines changed

code/game/jobs/job/civilians/other/survivors.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ GLOBAL_LIST_EMPTY(spawned_survivors)
7676
if(picked_spawner.roundstart_damage_max > 0)
7777
if(istype(picked_spawner) && picked_spawner.roundstart_damage_max > 0)
7878
for(var/i in 0 to picked_spawner.roundstart_damage_times)
79-
H.take_limb_damage(rand(picked_spawner.roundstart_damage_min, picked_spawner.roundstart_damage_max), 0)
79+
H.take_limb_damage(rand(picked_spawner.roundstart_damage_min, picked_spawner.roundstart_damage_max), 0)
8080

8181
H.name = H.get_visible_name()
8282

code/game/machinery/computer/skills.dm

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@
6969
</tr>"}
7070
if(!isnull(GLOB.data_core.general))
7171
for(var/datum/data/record/R in sortRecord(GLOB.data_core.general, sortBy, order))
72-
for(var/datum/data/record/E in GLOB.data_core.security)
7372
dat += "<tr><td><A href='byond://?src=\ref[src];choice=Browse Record;d_rec=\ref[R]'>[R.fields["name"]]</a></td>"
7473
dat += "<td>[R.fields["id"]]</td>"
7574
dat += "<td>[R.fields["rank"]]</td>"
@@ -228,7 +227,6 @@ What a mess.*/
228227
if (!( GLOB.data_core.general.Find(R) ))
229228
temp = "Record Not Found!"
230229
else
231-
for(var/datum/data/record/E in GLOB.data_core.security)
232230
active1 = R
233231
screen = 3
234232

code/modules/projectiles/guns/specialist/launcher/launcher.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
cylinder.storage_flags ^= STORAGE_USING_DRAWING_METHOD
4040
if(preload && !spawn_empty)
4141
for(var/i = 1 to cylinder.storage_slots)
42-
new preload(cylinder)
42+
new preload(cylinder)
4343
update_icon()
4444

4545
/obj/item/weapon/gun/launcher/Destroy(force)

code/modules/recycling/disposal.dm

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,6 @@
466466
var/active = 0 //True if the holder is moving, otherwise inactive
467467
dir = 0
468468
var/count = 2048 //Can travel 2048 steps before going inactive (in case of loops)
469-
var/has_fat_guy = 0 //True if contains a fat person
470469
var/destinationTag = "" //Changes if contains a delivery container
471470
var/tomail = 0 //Changes if contains wrapped package
472471
var/hasmob = 0 //If it contains a mob
@@ -528,12 +527,6 @@
528527
for(var/mob/living/H in src)
529528
H.take_overall_damage(20, 0, "Blunt Trauma") //Horribly maim any living creature jumping down disposals. c'est la vie
530529

531-
if(has_fat_guy && prob(2)) //Chance of becoming stuck per segment if contains a fat guy
532-
active = 0
533-
//Find the fat guys
534-
for(var/mob/living/carbon/human/H in src)
535-
536-
break
537530
sleep(1) //Was 1
538531
var/obj/structure/disposalpipe/curr = loc
539532
if(!curr && loc)
@@ -574,8 +567,6 @@
574567
if(M.client) //If a client mob, update eye to follow this holder
575568
M.client.set_eye(src)
576569

577-
if(other.has_fat_guy)
578-
has_fat_guy = 1
579570
qdel(other)
580571

581572
/obj/structure/disposalholder/proc/settag(new_tag)

0 commit comments

Comments
 (0)