cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 07:27:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

More CI for conditionals (#24050)

Browse Source 
* yay

* and thus, it was fixed

* and this fix too, so that the lang server stops complaining

* warrior review
This commit is contained in:
Contrabang
2024-02-06 18:29:33 +00:00
committed by GitHub
parent 877b3b38f7
commit 848c717771
26 changed files with 46 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human_update_icons.dm
+2 -1
View File
@@ -110,7 +110,8 @@ Please contact me on #coderbus IRC. ~Carn x
var/list/cached_standing_overlays = list() // List of everything currently in a human's actual overlays
/mob/living/carbon/human/proc/apply_overlay(cache_index)
if((. = overlays_standing[cache_index]))
. = overlays_standing[cache_index]
if(.)
add_overlay(.)
/mob/living/carbon/human/proc/remove_overlay(cache_index)
code/modules/mob/living/silicon/ai/ai_mob.dm
+1 -1
View File
@@ -27,7 +27,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
if(subject!=null)
for(var/A in GLOB.ai_list)
var/mob/living/silicon/ai/M = A
if((M.client && M.machine == subject))
if(M.client && M.machine == subject)
is_in_use = 1
subject.attack_ai(M)
return is_in_use
code/modules/mob/living/simple_animal/bot/ed209bot.dm
+3 -3
View File
@@ -438,7 +438,7 @@
lastfired = world.time
var/turf/T = loc
var/atom/U = (istype(target, /atom/movable) ? target.loc : target)
if((!U || !T))
if(!U || !T)
return
while(!isturf(U))
U = U.loc
@@ -504,11 +504,11 @@
/mob/living/simple_animal/bot/ed209/bullet_act(obj/item/projectile/Proj)
if(!disabled)
var/lasertag_check = 0
if((lasercolor == "b"))
if(lasercolor == "b")
if(istype(Proj, /obj/item/projectile/beam/lasertag/redtag))
lasertag_check++
else if((lasercolor == "r"))
else if(lasercolor == "r")
if(istype(Proj, /obj/item/projectile/beam/lasertag/bluetag))
lasertag_check++
code/modules/mob/living/simple_animal/hostile/syndicate_mobs.dm
+1 -1
View File
@@ -73,7 +73,7 @@
if(prob(ranged_block_chance))
visible_message("<span class='danger'>[src] blocks [Proj] with its shield!</span>")
else
if((Proj.damage_type == BRUTE || Proj.damage_type == BURN))
if(Proj.damage_type == BRUTE || Proj.damage_type == BURN)
adjustHealth(Proj.damage)
return 0
code/modules/mob/living/simple_animal/slime/slime_mob.dm
+1 -1
View File
@@ -250,7 +250,7 @@
if(!Proj)
return
attacked += 10
if((Proj.damage_type == BURN))
if(Proj.damage_type == BURN)
adjustBruteLoss(-abs(Proj.damage)) //fire projectiles heals slimes.
Proj.on_hit(src)
else