Merge pull request #10433 from VOREStation/upstream-merge-8085

[MIRROR] Linter Introduction + Cleanup
This commit is contained in:
Aronai Sieyes
2021-05-27 12:31:23 -04:00
committed by GitHub
244 changed files with 2604 additions and 2699 deletions
+1 -1
View File
@@ -130,7 +130,7 @@ two tiles on initialization, and which way a cliff is facing may change during m
var/subtraction_icon_state = "[icon_state]-subtract"
var/cache_string = "[icon_state]_[T.icon]_[T.icon_state]"
if(T && subtraction_icon_state in cached_icon_states(icon))
if(T && (subtraction_icon_state in cached_icon_states(icon)))
cut_overlays()
// If we've made the same icon before, just recycle it.
if(cache_string in GLOB.cliff_icon_cache)
@@ -434,17 +434,17 @@
breakout = 0
return
playsound(src, breakout_sound, 100, 1)
animate_shake()
add_fingerprint(escapee)
//Well then break it!
breakout = 0
to_chat(escapee, "<span class='warning'>You successfully break out!</span>")
visible_message("<span class='danger'>\The [escapee] successfully broke out of \the [src]!</span>")
playsound(src, breakout_sound, 100, 1)
break_open()
animate_shake()
add_fingerprint(escapee)
//Well then break it!
breakout = 0
to_chat(escapee, "<span class='warning'>You successfully break out!</span>")
visible_message("<span class='danger'>\The [escapee] successfully broke out of \the [src]!</span>")
playsound(src, breakout_sound, 100, 1)
break_open()
animate_shake()
/obj/structure/closet/proc/break_open()
sealed = 0
@@ -254,8 +254,6 @@
to_chat(user, "<span class='notice'>You refrain from putting things into the plant pot.</span>")
return
..()
/obj/structure/flora/pottedplant/attack_hand(mob/user)
if(!stored_item)
to_chat(user, "<span class='filter_notice'><b>You see nothing of interest in [src]...</b></span>")
@@ -68,7 +68,7 @@
user.pulledby = null
to_chat(user, "<span class='warning'>You lost your grip!</span>")
return
if(has_buckled_mobs() && pulling && user in buckled_mobs)
if(has_buckled_mobs() && pulling && (user in buckled_mobs))
if(pulling.stat || pulling.stunned || pulling.weakened || pulling.paralysis || pulling.lying || pulling.restrained())
pulling.pulledby = null
pulling = null
@@ -161,7 +161,7 @@
/obj/structure/bed/chair/wheelchair/CtrlClick(var/mob/user)
if(in_range(src, user))
if(!ishuman(user)) return
if(has_buckled_mobs() && user in buckled_mobs)
if(has_buckled_mobs() && (user in buckled_mobs))
to_chat(user, "<span class='warning'>You realize you are unable to push the wheelchair you sit in.</span>")
return
if(!pulling)
@@ -119,7 +119,7 @@ obj/structure/ex_act(severity)
if(pod.contents.len)
to_chat(AM, "<span class='notice'>The pod is already occupied.</span>")
return
else if(!pod.moving && pod.dir in directions())
else if(!pod.moving && (pod.dir in directions()))
AM.loc = pod
return
@@ -127,7 +127,7 @@ obj/structure/ex_act(severity)
/obj/structure/transit_tube/station/attack_hand(mob/user as mob)
if(!pod_moving)
for(var/obj/structure/transit_tube_pod/pod in loc)
if(!pod.moving && pod.dir in directions())
if(!pod.moving && (pod.dir in directions()))
if(icon_state == "closed")
open_animation()
@@ -156,7 +156,7 @@ obj/structure/ex_act(severity)
/obj/structure/transit_tube/station/proc/launch_pod()
for(var/obj/structure/transit_tube_pod/pod in loc)
if(!pod.moving && pod.dir in directions())
if(!pod.moving && (pod.dir in directions()))
spawn(5)
pod_moving = 1
close_animation()