cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-06 23:51:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/admin/IsBanned.dm
View File

@@ -21,7 +21,7 @@
var/ckey = ckey(key)
var/client/C = GLOB.directory[ckey]
if (C && ckey == C.ckey && computer_id == C.computer_id && address == C.address)
if(C && ckey == C.ckey && computer_id == C.computer_id && address == C.address)
return //don't recheck connected clients.
if((ckey in GLOB.admin_datums) || (ckey in GLOB.de_admins))

8
code/modules/admin/db_ban/functions.dm
View File

@@ -53,9 +53,9 @@
blockselfban = 1
kickbannedckey = 1
if( !bantype_pass ) return
if( !istext(reason) ) return
if( !isnum(duration) ) return
if(!bantype_pass) return
if(!istext(reason)) return
if(!isnum(duration)) return
var/ckey
var/computerid
@@ -229,7 +229,7 @@
if(BANTYPE_ANY_FULLBAN)
bantype_str = "ANY"
bantype_pass = 1
if( !bantype_pass ) return
if(!bantype_pass) return
var/bantype_sql
if(bantype_str == "ANY")

2
code/modules/admin/holder2.dm
View File

@@ -120,7 +120,7 @@ you will have to do something like if(client.holder.rights & R_ADMIN) yourself.
if(!other || !other.holder)
return 1
if(usr.client.holder.rights != other.holder.rights)
if( (usr.client.holder.rights & other.holder.rights) == other.holder.rights )
if((usr.client.holder.rights & other.holder.rights) == other.holder.rights)
return 1 //we have all the rights they have and more
to_chat(usr, "<font color='red'>Error: Cannot proceed. They have more or equal rights to us.</font>")
return 0

4
code/modules/admin/misc_admin_procs.dm
View File

@@ -537,8 +537,8 @@ GLOBAL_VAR_INIT(nologevent, 0)
if(!check_rights(R_SERVER))
return
GLOB.enter_allowed = !( GLOB.enter_allowed )
if(!( GLOB.enter_allowed ))
GLOB.enter_allowed = !GLOB.enter_allowed
if(!GLOB.enter_allowed)
to_chat(world, "<B>New players may no longer enter the game.</B>")
else
to_chat(world, "<B>New players may now enter the game.</B>")

4
code/modules/admin/player_panel.dm
View File

@@ -33,7 +33,7 @@
var maintable_data = document.getElementById('maintable_data');
var ltr = maintable_data.getElementsByTagName("tr");
for( var i = 0; i < ltr.length; ++i )
for(var i = 0; i < ltr.length; ++i)
{
try{
var tr = ltr\[i\];
@@ -46,7 +46,7 @@
var search = lsearch\[0\];
//var inner_span = li.getElementsByTagName("span")\[1\] //Should only ever contain one element.
//document.write("<p>"+search.innerText+"<br>"+filter+"<br>"+search.innerText.indexOf(filter))
if( search.innerText.toLowerCase().indexOf(filter) == -1 )
if(search.innerText.toLowerCase().indexOf(filter) == -1)
{
//document.write("a");
//ltr.removeChild(tr);

2
code/modules/admin/secrets.dm
View File

@@ -64,7 +64,7 @@
if(1)
if(check_rights((R_EVENT|R_SERVER),0))
var/security_levels_data = ""
for (var/level_name in SSsecurity_level.available_levels)
for(var/level_name in SSsecurity_level.available_levels)
var/datum/security_level/this_level = SSsecurity_level.available_levels[level_name]
security_levels_data += "<a href='?src=[UID()];secretsfun=securitylevel;number=[this_level.number_level]'>[this_level.name]</a>"

42
code/modules/admin/topic.dm
View File

@@ -390,31 +390,31 @@
if("Yes") delmob = 1
switch(href_list["simplemake"])
if("observer") M.change_mob_type( /mob/dead/observer , null, null, delmob, 1 )
if("drone") M.change_mob_type( /mob/living/carbon/alien/humanoid/drone , null, null, delmob, 1 )
if("hunter") M.change_mob_type( /mob/living/carbon/alien/humanoid/hunter , null, null, delmob, 1 )
if("queen") M.change_mob_type( /mob/living/carbon/alien/humanoid/queen/large , null, null, delmob, 1 )
if("sentinel") M.change_mob_type( /mob/living/carbon/alien/humanoid/sentinel , null, null, delmob, 1 )
if("larva") M.change_mob_type( /mob/living/carbon/alien/larva , null, null, delmob, 1 )
if("observer") M.change_mob_type( /mob/dead/observer , null, null, delmob, 1)
if("drone") M.change_mob_type( /mob/living/carbon/alien/humanoid/drone , null, null, delmob, 1)
if("hunter") M.change_mob_type( /mob/living/carbon/alien/humanoid/hunter , null, null, delmob, 1)
if("queen") M.change_mob_type( /mob/living/carbon/alien/humanoid/queen/large , null, null, delmob, 1)
if("sentinel") M.change_mob_type( /mob/living/carbon/alien/humanoid/sentinel , null, null, delmob, 1)
if("larva") M.change_mob_type( /mob/living/carbon/alien/larva , null, null, delmob, 1)
if("human")
var/posttransformoutfit = usr.client.robust_dress_shop()
var/mob/living/carbon/human/newmob = M.change_mob_type(/mob/living/carbon/human, null, null, delmob, 1)
if(posttransformoutfit && istype(newmob))
newmob.equipOutfit(posttransformoutfit)
if("slime") M.change_mob_type( /mob/living/simple_animal/slime , null, null, delmob, 1 )
if("monkey") M.change_mob_type( /mob/living/carbon/human/monkey , null, null, delmob, 1 )
if("robot") M.change_mob_type( /mob/living/silicon/robot , null, null, delmob, 1 )
if("cat") M.change_mob_type( /mob/living/simple_animal/pet/cat , null, null, delmob, 1 )
if("runtime") M.change_mob_type( /mob/living/simple_animal/pet/cat/Runtime , null, null, delmob, 1 )
if("corgi") M.change_mob_type( /mob/living/simple_animal/pet/dog/corgi , null, null, delmob, 1 )
if("crab") M.change_mob_type( /mob/living/simple_animal/crab , null, null, delmob, 1 )
if("coffee") M.change_mob_type( /mob/living/simple_animal/crab/Coffee , null, null, delmob, 1 )
if("parrot") M.change_mob_type( /mob/living/simple_animal/parrot , null, null, delmob, 1 )
if("polyparrot") M.change_mob_type( /mob/living/simple_animal/parrot/Poly , null, null, delmob, 1 )
if("constructarmoured") M.change_mob_type( /mob/living/simple_animal/hostile/construct/armoured , null, null, delmob, 1 )
if("constructbuilder") M.change_mob_type( /mob/living/simple_animal/hostile/construct/builder , null, null, delmob, 1 )
if("constructwraith") M.change_mob_type( /mob/living/simple_animal/hostile/construct/wraith , null, null, delmob, 1 )
if("shade") M.change_mob_type( /mob/living/simple_animal/shade , null, null, delmob, 1 )
if("slime") M.change_mob_type( /mob/living/simple_animal/slime , null, null, delmob, 1)
if("monkey") M.change_mob_type( /mob/living/carbon/human/monkey , null, null, delmob, 1)
if("robot") M.change_mob_type( /mob/living/silicon/robot , null, null, delmob, 1)
if("cat") M.change_mob_type( /mob/living/simple_animal/pet/cat , null, null, delmob, 1)
if("runtime") M.change_mob_type( /mob/living/simple_animal/pet/cat/Runtime , null, null, delmob, 1)
if("corgi") M.change_mob_type( /mob/living/simple_animal/pet/dog/corgi , null, null, delmob, 1)
if("crab") M.change_mob_type( /mob/living/simple_animal/crab , null, null, delmob, 1)
if("coffee") M.change_mob_type( /mob/living/simple_animal/crab/Coffee , null, null, delmob, 1)
if("parrot") M.change_mob_type( /mob/living/simple_animal/parrot , null, null, delmob, 1)
if("polyparrot") M.change_mob_type( /mob/living/simple_animal/parrot/Poly , null, null, delmob, 1)
if("constructarmoured") M.change_mob_type( /mob/living/simple_animal/hostile/construct/armoured , null, null, delmob, 1)
if("constructbuilder") M.change_mob_type( /mob/living/simple_animal/hostile/construct/builder , null, null, delmob, 1)
if("constructwraith") M.change_mob_type( /mob/living/simple_animal/hostile/construct/wraith , null, null, delmob, 1)
if("shade") M.change_mob_type( /mob/living/simple_animal/shade , null, null, delmob, 1)
log_admin("[key_name(usr)] has used rudimentary transformation on [key_name(M)]. Transforming to [href_list["simplemake"]]; deletemob=[delmob]")
message_admins("<span class='notice'>[key_name_admin(usr)] has used rudimentary transformation on [key_name_admin(M)]. Transforming to [href_list["simplemake"]]; deletemob=[delmob]</span>", 1)
@@ -2696,7 +2696,7 @@
var/atom/target //Where the object will be spawned
var/where = href_list["object_where"]
if(!( where in list("onfloor","inhand","inmarked") ))
if(!( where in list("onfloor","inhand","inmarked")))
where = "onfloor"

2
code/modules/admin/verbs/antag-ooc.dm
View File

@@ -13,7 +13,7 @@
display_name = holder.fakekey
for(var/mob/M in GLOB.mob_list)
if((M.mind && M.mind.special_role && M.client) || (M.client && M.client.holder && (M.client.holder.rights & R_ADMIN)) )
if((M.mind && M.mind.special_role && M.client) || (M.client && M.client.holder && (M.client.holder.rights & R_ADMIN)))
to_chat(M, "<font color='#960018'><span class='ooc'><span class='prefix'>AOOC:</span> <EM>[display_name]:</EM> <span class='message'>[msg]</span></span></font>")

4
code/modules/admin/verbs/debug.dm
View File

@@ -497,7 +497,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
log_admin("[key_name(usr)] assumed direct control of [M].")
var/mob/adminmob = src.mob
M.ckey = src.ckey
if( isobserver(adminmob) )
if(isobserver(adminmob))
qdel(adminmob)
SSblackbox.record_feedback("tally", "admin_verb", 1, "Assume Direct Control") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -644,7 +644,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
if(alert("Should the items in their pockets be dropped? Selecting \"No\" will delete them.", "Robust quick dress shop", "Yes", "No") == "No")
delete_pocket = TRUE
for (var/obj/item/I in H.get_equipped_items(delete_pocket))
for(var/obj/item/I in H.get_equipped_items(delete_pocket))
qdel(I)
if(dresscode != "Naked")
H.equipOutfit(dresscode)

6
code/modules/admin/verbs/getlogs.dm
View File

@@ -29,11 +29,11 @@
message_admins("[key_name_admin(src)] accessed file: [path]")
switch(alert("View (in game), Open (in your system's text editor), or Download?", path, "View", "Open", "Download"))
if ("View")
if("View")
src << browse("<pre style='word-wrap: break-word;'>[html_encode(wrap_file2text(wrap_file(path)))]</pre>", list2params(list("window" = "viewfile.[path]")))
if ("Open")
if("Open")
src << run(wrap_file(path))
if ("Download")
if("Download")
src << ftp(wrap_file(path))
else
return

4
code/modules/admin/verbs/infiltratorteam_syndicate.dm
View File

@@ -156,7 +156,7 @@ GLOBAL_VAR_INIT(sent_syndicate_infiltration_team, 0)
// Uplink
var/obj/item/implant/uplink/sit/U = new /obj/item/implant/uplink/sit(src)
U.implant(src)
if (flag_mgmt)
if(flag_mgmt)
U.hidden_uplink.uses = 2500
else
U.hidden_uplink.uses = num_tc
@@ -174,7 +174,7 @@ GLOBAL_VAR_INIT(sent_syndicate_infiltration_team, 0)
equip_to_slot_or_del(new /obj/item/clothing/shoes/chameleon/noslip(src), SLOT_HUD_SHOES)
var/obj/item/card/id/syndicate/W = new(src)
if (flag_mgmt)
if(flag_mgmt)
W.icon_state = "commander"
else
W.icon_state = "id"

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

@@ -84,7 +84,7 @@ GLOBAL_VAR_INIT(intercom_range_display_status, 0)
if(C1.loc == C2.loc)
output += "<li>overlapping sec. cameras at \[[C1.x], [C1.y], [C1.z]\] ([C1.loc.loc]) Networks: [C1.network] and [C2.network]</font></li>"
var/turf/T = get_step(C1,turn(C1.dir,180))
if(!T || !isturf(T) || !T.density )
if(!T || !isturf(T) || !T.density)
if(!(locate(/obj/structure/grille,T)))
var/window_check = 0
for(var/obj/structure/window/W in T)

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

@@ -142,7 +142,7 @@
var/msg = clean_input("Message:", "Enter the text you wish to appear to your target:")
if( !msg )
if(!msg)
return
msg = admin_pencode_to_html(msg)