cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-19 18:17:52 +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 20:59:43 +00:00
committed by GitHub
co-authored by Henri215
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/modules/reagents/chem_splash.dm
+1 -1
View File
@@ -41,7 +41,7 @@
for(var/turf/T in (orange(i, epicenter) - orange(i-1, epicenter)))
turflist |= T
for(var/turf/T in turflist)
if( !(get_dir(T,epicenter) in GLOB.cardinal) && (abs(T.x - epicenter.x) == abs(T.y - epicenter.y) ))
if(!(get_dir(T,epicenter) in GLOB.cardinal) && (abs(T.x - epicenter.x) == abs(T.y - epicenter.y)))
turflist.Remove(T)
turflist.Add(T) // we move the purely diagonal turfs to the end of the list.
for(var/turf/T in turflist)
code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+12 -12
View File
@@ -348,13 +348,13 @@
SStgui.update_uis(src)
/obj/machinery/reagentgrinder/proc/is_allowed(obj/item/reagent_containers/O)
for (var/i in blend_items)
for(var/i in blend_items)
if(istype(O, i))
return TRUE
return FALSE
/obj/machinery/reagentgrinder/proc/get_allowed_by_id(obj/item/O)
for (var/i in blend_items)
for(var/i in blend_items)
if(istype(O, i))
return blend_items[i]
@@ -405,7 +405,7 @@
SStgui.update_uis(src)
//Snacks
for (var/obj/item/reagent_containers/food/snacks/O in holdingitems)
for(var/obj/item/reagent_containers/food/snacks/O in holdingitems)
if(beaker.reagents.holder_full())
break
@@ -413,7 +413,7 @@
if(isnull(allowed))
break
for (var/r_id in allowed)
for(var/r_id in allowed)
var/space = beaker.reagents.maximum_volume - beaker.reagents.total_volume
var/amount = get_juice_amount(O)
@@ -443,7 +443,7 @@
SStgui.update_uis(src)
//Snacks and Plants
for (var/obj/item/reagent_containers/food/snacks/O in holdingitems)
for(var/obj/item/reagent_containers/food/snacks/O in holdingitems)
if(beaker.reagents.holder_full())
break
@@ -451,7 +451,7 @@
if(isnull(allowed))
break
for (var/r_id in allowed)
for(var/r_id in allowed)
var/space = beaker.reagents.maximum_volume - beaker.reagents.total_volume
var/amount = allowed[r_id]
@@ -482,7 +482,7 @@
remove_object(O)
//Sheets and rods(!)
for (var/obj/item/stack/O in holdingitems)
for(var/obj/item/stack/O in holdingitems)
if(beaker.reagents.holder_full())
break
@@ -495,7 +495,7 @@
if(!space) //if no free space - exit
break
O.amount -= 1 //remove one from stack
for (var/r_id in allowed)
for(var/r_id in allowed)
var/spaceused = min(allowed[r_id] * efficiency, space)
space -= spaceused
beaker.reagents.add_reagent(r_id, spaceused)
@@ -504,11 +504,11 @@
break
//Plants
for (var/obj/item/grown/O in holdingitems)
for(var/obj/item/grown/O in holdingitems)
if(beaker.reagents.holder_full())
break
var/allowed = get_allowed_by_id(O)
for (var/r_id in allowed)
for(var/r_id in allowed)
var/space = beaker.reagents.maximum_volume - beaker.reagents.total_volume
var/amount = allowed[r_id]
if(amount == 0)
@@ -522,7 +522,7 @@
remove_object(O)
//Slime Extractis
for (var/obj/item/slime_extract/O in holdingitems)
for(var/obj/item/slime_extract/O in holdingitems)
if(beaker.reagents.holder_full())
break
var/space = beaker.reagents.maximum_volume - beaker.reagents.total_volume
@@ -534,7 +534,7 @@
remove_object(O)
//Everything else - Transfers reagents from it into beaker
for (var/obj/item/reagent_containers/O in holdingitems)
for(var/obj/item/reagent_containers/O in holdingitems)
if(beaker.reagents.holder_full())
break
var/amount = O.reagents.total_volume
code/modules/reagents/chemistry/reagents/food_reagents.dm
+6 -6
View File
@@ -222,14 +222,14 @@
var/mouth_covered = 0
var/eyes_covered = 0
var/obj/item/safe_thing = null
if( victim.wear_mask )
if(victim.wear_mask)
if(victim.wear_mask.flags_cover & MASKCOVERSEYES)
eyes_covered = 1
safe_thing = victim.wear_mask
if(victim.wear_mask.flags_cover & MASKCOVERSMOUTH)
mouth_covered = 1
safe_thing = victim.wear_mask
if( victim.head )
if(victim.head)
if(victim.head.flags_cover & MASKCOVERSEYES)
eyes_covered = 1
safe_thing = victim.head
@@ -238,12 +238,12 @@
safe_thing = victim.head
if(victim.glasses)
eyes_covered = 1
if( !safe_thing )
if(!safe_thing)
safe_thing = victim.glasses
if( eyes_covered && mouth_covered )
if(eyes_covered && mouth_covered)
to_chat(victim, "<span class='danger'>Your [safe_thing] protects you from the pepperspray!</span>")
return
else if( mouth_covered ) // Reduced effects if partially protected
else if(mouth_covered) // Reduced effects if partially protected
to_chat(victim, "<span class='danger'>Your [safe_thing] protect you from most of the pepperspray!</span>")
if(prob(5))
victim.emote("scream")
@@ -254,7 +254,7 @@
victim.Weaken(6 SECONDS)
victim.drop_item()
return
else if( eyes_covered ) // Eye cover is better than mouth cover
else if(eyes_covered) // Eye cover is better than mouth cover
to_chat(victim, "<span class='danger'>Your [safe_thing] protects your eyes from the pepperspray!</span>")
victim.EyeBlurry(6 SECONDS)
victim.damageoverlaytemp = 30
code/modules/reagents/reagent_containers/dropper.dm
+1 -1
View File
@@ -39,7 +39,7 @@
if(H.glasses)
safe_thing = H.glasses
if(H.wear_mask )
if(H.wear_mask)
if(H.wear_mask.flags_cover & MASKCOVERSEYES)
safe_thing = H.wear_mask
if(H.head)