CI now bans the use of weird spacing in conditionals (#22777)

* no more spaces

* Matthew 10:22

* fixes

* dgamerl review

* Update code/modules/hydroponics/plant_genes.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/modules/mob/living/simple_animal/bot/ed209bot.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/pda/PDA.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* fuck

* bah

* Update tools/ci/check_grep2.py

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* oops

* guh

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
This commit is contained in:
Contrabang
2023-11-12 15:59:43 -05:00
committed by GitHub
parent 35754c77ea
commit 48d7b00a0d
204 changed files with 562 additions and 544 deletions
+2 -2
View File
@@ -135,8 +135,8 @@
if(!in_range(user, src) || !isturf(user.loc) || user.incapacitated() || M.anchored)
return FALSE
if (isguardian(user))
if (M.loc == user.loc || user.alpha == 60) //Alpha is for detecting ranged guardians in scout mode
if(isguardian(user))
if(M.loc == user.loc || user.alpha == 60) //Alpha is for detecting ranged guardians in scout mode
return //unmanifested guardians shouldn't be able to buckle mobs
add_fingerprint(user)
+1 -1
View File
@@ -117,7 +117,7 @@
if(teleport_x_offset && teleport_y_offset && teleport_z_offset)
var/turf/T = locate(rand(teleport_x, teleport_x_offset), rand(teleport_y, teleport_y_offset), rand(teleport_z, teleport_z_offset))
if (T)
if(T)
A.forceMove(T)
/* Fancy teleporter, creates sparks and smokes when used */
+1 -1
View File
@@ -293,7 +293,7 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons
if(!H.gloves || (!(H.gloves.resistance_flags & (UNACIDABLE|ACID_PROOF))))
to_chat(user, "<span class='warning'>The acid on [src] burns your hand!</span>")
var/obj/item/organ/external/affecting = H.get_organ("[user.hand ? "l" : "r" ]_arm")
if(affecting && affecting.receive_damage( 0, 5 )) // 5 burn damage
if(affecting && affecting.receive_damage(0, 5)) // 5 burn damage
H.UpdateDamageIcon()
if(isstorage(src.loc))
+1 -1
View File
@@ -184,7 +184,7 @@
/area/wizard_station
)
for(var/type in SPECIALS)
if( istype(A,type) )
if(istype(A,type))
return AREA_SPECIAL
return AREA_STATION
+1 -1
View File
@@ -138,7 +138,7 @@
break
if(power_drained > max_power * 0.98)
if (!admins_warned)
if(!admins_warned)
admins_warned = TRUE
message_admins("Power sink at ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>) is 95% full. Explosion imminent.")
playsound(src, 'sound/effects/screech.ogg', 100, 1, 1)
@@ -145,7 +145,7 @@
new/obj/effect/temp_visual/teleport_abductor/syndi_teleporter(mobloc)
playsound(destination, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
new/obj/effect/temp_visual/teleport_abductor/syndi_teleporter(destination)
else if (EMP_D == FALSE && !(bagholding.len && !flawless)) // This is where the fun begins
else if(EMP_D == FALSE && !(bagholding.len && !flawless)) // This is where the fun begins
var/direction = get_dir(user, destination)
panic_teleport(user, destination, direction)
else // Emp activated? Bag of holding? No saving throw for you
+3 -3
View File
@@ -40,10 +40,10 @@
/obj/item/latexballon/ex_act(severity)
burst()
switch(severity)
if (1)
if(1)
qdel(src)
if (2)
if (prob(50))
if(2)
if(prob(50))
qdel(src)
/obj/item/latexballon/bullet_act(obj/item/projectile/P)
@@ -372,7 +372,7 @@
cyborg.cell.use(5)
repair_tick = 0
if((world.time - 2000) > msg_cooldown )
if((world.time - 2000) > msg_cooldown)
var/msgmode = "standby"
if(cyborg.health < 0)
msgmode = "critical"
@@ -58,7 +58,7 @@
if(!(critter.healable))
to_chat(user, "<span class='notice'>You cannot use [src] on [critter]!</span>")
return
else if (critter.health == critter.maxHealth)
else if(critter.health == critter.maxHealth)
to_chat(user, "<span class='notice'>[critter] is at full health.</span>")
return
else if(heal_brute < 1)
+1 -1
View File
@@ -15,7 +15,7 @@
return 0
if(isrobot(M)) //Repairing cyborgs
var/mob/living/silicon/robot/R = M
if(R.getBruteLoss() || R.getFireLoss() )
if(R.getBruteLoss() || R.getFireLoss())
R.heal_overall_damage(15, 15)
use(1)
user.visible_message("<span class='notice'>\The [user] applied some [src] at [R]'s damaged areas.</span>",\
@@ -71,7 +71,7 @@ GLOBAL_LIST_INIT(glass_recipes, list (
to_chat(user, "<span class='notice'>You attach wire to [src].</span>")
new /obj/item/stack/light_w(user.loc)
use(1)
else if( istype(W, /obj/item/stack/rods) )
else if(istype(W, /obj/item/stack/rods))
var/obj/item/stack/rods/V = W
var/obj/item/stack/sheet/rglass/RG = new (user.loc)
RG.add_fingerprint(user)
@@ -164,7 +164,7 @@ GLOBAL_LIST_INIT(pglass_recipes, list (
/obj/item/stack/sheet/plasmaglass/attackby(obj/item/W, mob/user, params)
..()
if( istype(W, /obj/item/stack/rods) )
if(istype(W, /obj/item/stack/rods))
var/obj/item/stack/rods/V = W
var/obj/item/stack/sheet/plasmarglass/RG = new (user.loc)
RG.add_fingerprint(user)
@@ -29,7 +29,7 @@
if(!I.use_tool(src, user, volume = I.tool_volume))
to_chat(user, "<span class='warning'>You can not reform this!</span>")
return
if (mineralType == "metal")
if(mineralType == "metal")
var/obj/item/stack/sheet/metal/new_item = new(user.loc)
user.visible_message("[user.name] shaped [src] into metal with the welding tool.", \
"<span class='notice'>You shaped [src] into metal with the welding tool.</span>", \
+1 -1
View File
@@ -47,7 +47,7 @@
icon_state = "screwdriver_[param_color]"
belt_icon = "screwdriver_[param_color]"
if (prob(75))
if(prob(75))
src.pixel_y = rand(0, 16)
/obj/item/screwdriver/attack(mob/living/carbon/M, mob/living/carbon/user)
+1 -1
View File
@@ -59,7 +59,7 @@
else
var/mob/living/carbon/human/H = user
var/obj/item/organ/external/affecting = H.get_organ("[user.hand ? "l" : "r" ]_hand")
if(affecting.receive_damage( 0, 5 )) //INFERNO
if(affecting.receive_damage(0, 5)) //INFERNO
H.UpdateDamageIcon()
to_chat(user,"<span class='notice'>You light [src], but you burn your hand in the process.</span>")
if(world.time > next_on_message)
+1 -1
View File
@@ -56,7 +56,7 @@
. += "<span class='notice'>[src] has been eaten down to a sliver!</span>"
/obj/item/soap/attack(mob/target as mob, mob/user as mob)
if(target && user && ishuman(target) && ishuman(user) && !target.stat && !user.stat && user.zone_selected == "mouth" )
if(target && user && ishuman(target) && ishuman(user) && !target.stat && !user.stat && user.zone_selected == "mouth")
user.visible_message("<span class='warning'>[user] starts washing [target]'s mouth out with [name]!</span>")
if(do_after(user, cleanspeed, target = target))
user.visible_message("<span class='warning'>[user] washes [target]'s mouth out with [name]!</span>")
@@ -459,7 +459,7 @@
/obj/item/storage/bag/tray/cyborg
/obj/item/storage/bag/tray/cyborg/afterattack(atom/target, mob/user as mob)
if( isturf(target) || istype(target,/obj/structure/table) )
if(isturf(target) || istype(target,/obj/structure/table))
var/found_table = istype(target,/obj/structure/table/)
if(!found_table) //it must be a turf!
for(var/obj/structure/table/T in target)
@@ -469,7 +469,7 @@
var/turf/dropspot
if(!found_table) // don't unload things onto walls or other silly places.
dropspot = user.loc
else if( isturf(target) ) // they clicked on a turf with a table in it
else if(isturf(target)) // they clicked on a turf with a table in it
dropspot = target
else // they clicked on a table
dropspot = target.loc
@@ -39,7 +39,7 @@
open(user)
return 0
if(!( istype(over_object, /obj/screen) ))
if(!istype(over_object, /obj/screen))
return 1
//makes sure master_item is equipped before putting it in hand, so that we can't drag it into our hand from miles away.
@@ -47,7 +47,7 @@
if(!(master_item.loc == user) || (master_item.loc && master_item.loc.loc == user))
return 0
if(!( user.restrained() ) && !( user.stat ))
if(!user.restrained() && !user.stat)
switch(over_object.name)
if("r_hand")
user.unEquip(master_item, silent = TRUE)
@@ -239,7 +239,7 @@
return
if(user.restrained() || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED))
return
if((!( istype(O, /atom/movable) ) || O.anchored || get_dist(user, src) > 1 || get_dist(user, O) > 1 || user.contents.Find(src)))
if((!istype(O, /atom/movable) || O.anchored || get_dist(user, src) > 1 || get_dist(user, O) > 1 || user.contents.Find(src)))
return
if(!ishuman(user) && !isrobot(user)) //No ghosts, you cannot shove people into fucking lockers
return
@@ -90,7 +90,7 @@
if(W != user.get_active_hand())
to_chat(user, "You must be holding the pen to perform this action.")
return
if(! Adjacent(user))
if(!Adjacent(user))
to_chat(user, "You have moved too far away from the cardboard box.")
return
decalselection = replacetext(decalselection, " ", "_")
+2 -2
View File
@@ -22,9 +22,9 @@
. = ..()
if(start_showpieces.len && !start_showpiece_type)
var/list/showpiece_entry = pick(start_showpieces)
if (showpiece_entry && showpiece_entry["type"])
if(showpiece_entry && showpiece_entry["type"])
start_showpiece_type = showpiece_entry["type"]
if (showpiece_entry["trophy_message"])
if(showpiece_entry["trophy_message"])
trophy_message = showpiece_entry["trophy_message"]
if(start_showpiece_type)
showpiece = new start_showpiece_type (src)
@@ -119,7 +119,7 @@
update_appearance(UPDATE_NAME | UPDATE_OVERLAYS)
/obj/structure/door_assembly/crowbar_act(mob/user, obj/item/I)
if(state != AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER )
if(state != AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER)
return
. = TRUE
if(!I.tool_use_check(user, 0))
@@ -140,7 +140,7 @@
update_appearance(UPDATE_NAME | UPDATE_OVERLAYS)
/obj/structure/door_assembly/screwdriver_act(mob/user, obj/item/I)
if(state != AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER )
if(state != AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER)
return
. = TRUE
if(!I.tool_use_check(user, 0))
+1 -1
View File
@@ -107,7 +107,7 @@
to_chat(user, "<span class='warning'>You need at least five rods to add plating!</span>")
return
to_chat(user, "<span class='notice'>You start adding plating...</span>")
if (do_after(user, 40, target = src))
if(do_after(user, 40, target = src))
if(!loc || !S || S.get_amount() < 5)
return
S.use(5)
@@ -84,7 +84,7 @@
return ..()
/obj/structure/kitchenspike/MouseDrop_T(mob/living/victim, mob/living/user)
if (!user.Adjacent(src) || !user.Adjacent(victim) || isAI(user) || !ismob(victim))
if(!user.Adjacent(src) || !user.Adjacent(victim) || isAI(user) || !ismob(victim))
return
if(isanimal(user) && victim != user)
return // animals cannot put mobs other than themselves onto spikes
+6 -6
View File
@@ -11,11 +11,11 @@
/obj/structure/ladder/Initialize(mapload, obj/structure/ladder/up, obj/structure/ladder/down)
. = ..()
if (up)
if(up)
src.up = up
up.down = src
up.update_icon()
if (down)
if(down)
src.down = down
down.up = src
down.update_icon()
@@ -38,7 +38,7 @@
L.update_icon()
break
if(!up)
for (var/obj/structure/ladder/L in locate(T.x, T.y, T.z + 1))
for(var/obj/structure/ladder/L in locate(T.x, T.y, T.z + 1))
up = L
L.down = src // Don't waste effort looping the other way
L.update_icon()
@@ -93,7 +93,7 @@
if(up && down)
var/result = alert("Go up or down [src]?", "[name]", "Up", "Down", "Cancel")
if (!is_ghost && !in_range(src, user))
if(!is_ghost && !in_range(src, user))
return // nice try
switch(result)
if("Up")
@@ -164,13 +164,13 @@
down = L
L.up = src
L.update_icon()
if (up)
if(up)
break // break if both our connections are filled
else if(!up && L.height == height + 1)
up = L
L.down = src
L.update_icon()
if (down)
if(down)
break // break if both our connections are filled
update_icon()
+3 -3
View File
@@ -138,7 +138,7 @@
/obj/structure/morgue/attack_hand(mob/user as mob)
if(connected)
for(var/atom/movable/A in connected.loc)
if(!(A.anchored))
if(!A.anchored)
A.forceMove(src)
get_revivable(TRUE)
playsound(loc, open_sound, 50, 1)
@@ -241,7 +241,7 @@
/obj/structure/m_tray/attack_hand(mob/user as mob)
if(connected)
for(var/atom/movable/A as mob|obj in loc)
if(!( A.anchored ))
if(!A.anchored)
A.forceMove(connected)
connected.connected = null
connected.update_icon(connected.update_state())
@@ -544,7 +544,7 @@ GLOBAL_LIST_EMPTY(crematoriums)
/obj/structure/c_tray/MouseDrop_T(atom/movable/O, mob/living/user)
if((!( istype(O, /atom/movable) ) || O.anchored || get_dist(user, src) > 1 || get_dist(user, O) > 1 || user.contents.Find(src) || user.contents.Find(O)))
if((!istype(O, /atom/movable) || O.anchored || get_dist(user, src) > 1 || get_dist(user, O) > 1 || user.contents.Find(src) || user.contents.Find(O)))
return
if(!ismob(O) && !istype(O, /obj/structure/closet/body_bag))
return
+4 -4
View File
@@ -72,7 +72,7 @@
if(flipped)
var/type = 0
var/subtype = null
for(var/direction in list(turn(dir,90), turn(dir,-90)) )
for(var/direction in list(turn(dir,90), turn(dir,-90)))
var/obj/structure/table/T = locate(/obj/structure/table,get_step(src,direction))
if(T && T.flipped)
type++
@@ -190,7 +190,7 @@
/obj/structure/table/MouseDrop_T(obj/O, mob/user)
if(..())
return TRUE
if((!( isitem(O) ) || user.get_active_hand() != O))
if((!isitem(O) || user.get_active_hand() != O))
return
if(isrobot(user))
return
@@ -346,7 +346,7 @@
if(flipped)
return 0
if( !straight_table_check(turn(direction,90)) || !straight_table_check(turn(direction,-90)) )
if(!straight_table_check(turn(direction,90)) || !straight_table_check(turn(direction,-90)))
return 0
dir = direction
@@ -893,7 +893,7 @@
. = . || mover.checkpass(PASSTABLE)
/obj/structure/rack/MouseDrop_T(obj/O, mob/user)
if((!( isitem(O) ) || user.get_active_hand() != O))
if((!isitem(O) || user.get_active_hand() != O))
return
if(isrobot(user))
return