cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-11 23:23:28 +01: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
code/datums/armor.dm
+2 -2
View File
@@ -2,7 +2,7 @@
/proc/getArmor(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, rad = 0, fire = 0, acid = 0, magic = 0)
. = locate(ARMORID)
if (!.)
if(!.)
. = new /datum/armor(melee, bullet, laser, energy, bomb, rad, fire, acid, magic)
/datum/armor
@@ -58,7 +58,7 @@
return getArmor(melee - AA.melee, bullet - AA.bullet, laser - AA.laser, energy - AA.energy, bomb - AA.bomb, rad - AA.rad, fire - AA.fire, acid - AA.acid, magic - AA.magic)
/datum/armor/vv_edit_var(var_name, var_value)
if (var_name == NAMEOF(src, tag))
if(var_name == NAMEOF(src, tag))
return FALSE
. = ..()
tag = ARMORID // update tag in case armor values were edited
code/datums/cache/powermonitor.dm
Vendored
+1 -1
View File
@@ -12,7 +12,7 @@ GLOBAL_DATUM_INIT(powermonitor_repository, /datum/repository/powermonitor, new()
return cache_entry.data
for(var/obj/machinery/computer/monitor/pMon in GLOB.power_monitors)
if( !(pMon.stat & (NOPOWER|BROKEN)) && !pMon.is_secret_monitor )
if(!(pMon.stat & (NOPOWER|BROKEN)) && !pMon.is_secret_monitor)
pMonData[++pMonData.len] = list ("Area" = get_area_name(pMon), "uid" = "[pMon.UID()]")
cache_entry.timestamp = world.time //+ 30 SECONDS
code/datums/components/_component.dm
+1 -1
View File
@@ -299,7 +299,7 @@
var/current_type = parent_type
. = list(our_type, current_type)
//and since most components are root level + 1, this won't even have to run
while (current_type != /datum/component)
while(current_type != /datum/component)
current_type = type2parent(current_type)
. += current_type
code/datums/components/defibrillator.dm
+1 -1
View File
@@ -252,7 +252,7 @@
else if(HAS_TRAIT(target, TRAIT_HUSK))
user.visible_message("<span class='boldnotice'>[defib_ref] buzzes: Resuscitation failed - Subject is husked.</span>")
defib_success = FALSE
else if (target.blood_volume < BLOOD_VOLUME_SURVIVE)
else if(target.blood_volume < BLOOD_VOLUME_SURVIVE)
user.visible_message("<span class='boldnotice'>[defib_ref] buzzes: Resuscitation failed - Patient blood volume critically low.</span>")
defib_success = FALSE
else if(!target.get_organ_slot("brain")) // So things like headless clings don't get outed
code/datums/components/orbiter.dm
+1 -1
View File
@@ -43,7 +43,7 @@
/// See atom/movable/proc/orbit for parameter definitions
/datum/component/orbiter/Initialize(atom/movable/orbiter, radius = 10, clockwise = FALSE, rotation_speed = 20, rotation_segments = 36, pre_rotation = TRUE, lock_in_orbit = FALSE, force_move = FALSE, orbit_layer = FLY_LAYER)
if (!istype(orbiter) || !isatom(parent) || isarea(parent))
if(!istype(orbiter) || !isatom(parent) || isarea(parent))
return COMPONENT_INCOMPATIBLE
orbiter_list = list()
code/datums/datumvars.dm
+16 -16
View File
@@ -269,11 +269,11 @@
if(event.keyCode == 13){ //Enter / return
var vars_ol = document.getElementById('vars');
var lis = vars_ol.getElementsByTagName("li");
for ( var i = 0; i < lis.length; ++i )
for(var i = 0; i < lis.length; ++i)
{
try{
var li = lis\[i\];
if ( li.style.backgroundColor == "#ffee88" )
if(li.style.backgroundColor == "#ffee88")
{
alist = lis\[i\].getElementsByTagName("a")
if(alist.length > 0){
@@ -287,13 +287,13 @@
if(event.keyCode == 38){ //Up arrow
var vars_ol = document.getElementById('vars');
var lis = vars_ol.getElementsByTagName("li");
for ( var i = 0; i < lis.length; ++i )
for(var i = 0; i < lis.length; ++i)
{
try{
var li = lis\[i\];
if ( li.style.backgroundColor == "#ffee88" )
if(li.style.backgroundColor == "#ffee88")
{
if( (i-1) >= 0){
if((i-1) >= 0){
var li_new = lis\[i-1\];
li.style.backgroundColor = "white";
li_new.style.backgroundColor = "#ffee88";
@@ -307,13 +307,13 @@
if(event.keyCode == 40){ //Down arrow
var vars_ol = document.getElementById('vars');
var lis = vars_ol.getElementsByTagName("li");
for ( var i = 0; i < lis.length; ++i )
for(var i = 0; i < lis.length; ++i)
{
try{
var li = lis\[i\];
if ( li.style.backgroundColor == "#ffee88" )
if(li.style.backgroundColor == "#ffee88")
{
if( (i+1) < lis.length){
if((i+1) < lis.length){
var li_new = lis\[i+1\];
li.style.backgroundColor = "white";
li_new.style.backgroundColor = "#ffee88";
@@ -336,11 +336,11 @@
}else{
var vars_ol = document.getElementById('vars');
var lis = vars_ol.getElementsByTagName("li");
for ( var i = 0; i < lis.length; ++i )
for(var i = 0; i < lis.length; ++i)
{
try{
var li = lis\[i\];
if ( li.innerText.toLowerCase().indexOf(filter) == -1 )
if(li.innerText.toLowerCase().indexOf(filter) == -1)
{
vars_ol.removeChild(li);
i--;
@@ -349,10 +349,10 @@
}
}
var lis_new = vars_ol.getElementsByTagName("li");
for ( var j = 0; j < lis_new.length; ++j )
for(var j = 0; j < lis_new.length; ++j)
{
var li1 = lis\[j\];
if (j == 0){
if(j == 0){
li1.style.backgroundColor = "#ffee88";
}else{
li1.style.backgroundColor = "white";
@@ -364,7 +364,7 @@
filter_text.focus();
filter_text.select();
var lastsearch = getCookie("[refid][cookieoffset]search");
if (lastsearch) {
if(lastsearch) {
filter_text.value = lastsearch;
updateSearch();
}
@@ -380,8 +380,8 @@
var ca = document.cookie.split(';');
for(var i=0; i<ca.length; i++) {
var c = ca\[i\];
while (c.charAt(0)==' ') c = c.substring(1,c.length);
if (c.indexOf(name)==0) return c.substring(name.length,c.length);
while(c.charAt(0)==' ') c = c.substring(1,c.length);
if(c.indexOf(name)==0) return c.substring(name.length,c.length);
}
return "";
}
@@ -572,7 +572,7 @@
return
var/new_name = reject_bad_name(sanitize(copytext(input(usr, "What would you like to name this mob?", "Input a name", M.real_name) as text|null, 1, MAX_NAME_LEN)), allow_numbers = TRUE)
if( !new_name || !M ) return
if(!new_name || !M) return
message_admins("Admin [key_name_admin(usr)] renamed [key_name_admin(M)] to [new_name].")
M.rename_character(M.real_name, new_name)
code/datums/mind.dm
+1 -1
View File
@@ -56,7 +56,7 @@
var/miming = 0 // Mime's vow of silence
/// A list of all the antagonist datums that the player is (does not include undatumized antags)
var/list/antag_datums
/// A lazy list of all teams the player is part of but doesnt have an antag role for (i.e. a custom admin team)
/// A lazy list of all teams the player is part of but doesnt have an antag role for, (i.e. a custom admin team)
var/list/teams
var/antag_hud_icon_state = null //this mind's ANTAG_HUD should have this icon_state
code/datums/recipe.dm
+1 -1
View File
@@ -114,7 +114,7 @@
for(var/datum/recipe/recipe in possible_recipes)
var/N_i = (recipe.items)?(recipe.items.len):0
var/N_r = (recipe.reagents)?(recipe.reagents.len):0
if(N_i > i_count || (N_i== i_count && N_r > r_count ))
if(N_i > i_count || (N_i== i_count && N_r > r_count))
r_count = N_r
i_count = N_i
. = recipe
code/datums/spells/night_vision.dm
+3 -3
View File
@@ -13,13 +13,13 @@
/obj/effect/proc_holder/spell/night_vision/cast(list/targets, mob/user = usr)
for(var/mob/living/target in targets)
switch(target.lighting_alpha)
if (LIGHTING_PLANE_ALPHA_VISIBLE)
if(LIGHTING_PLANE_ALPHA_VISIBLE)
target.lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
name = "Toggle Nightvision \[More]"
if (LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE)
if(LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE)
target.lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
name = "Toggle Nightvision \[Full]"
if (LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE)
if(LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE)
target.lighting_alpha = LIGHTING_PLANE_ALPHA_INVISIBLE
name = "Toggle Nightvision \[OFF]"
else