From 7d5e40014429390ce1f56e2ff404e49a9bd29cc4 Mon Sep 17 00:00:00 2001 From: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Mon, 2 May 2022 15:16:16 -0400 Subject: [PATCH] Fixing bots . = ..() is bad here, using return ..() instead --- code/modules/mob/living/bot/cleanbot.dm | 3 +-- code/modules/mob/living/bot/ed209bot.dm | 3 +-- code/modules/mob/living/bot/edCLNbot.dm | 3 +-- code/modules/mob/living/bot/farmbot.dm | 3 +-- code/modules/mob/living/bot/floorbot.dm | 3 +-- code/modules/mob/living/bot/medbot.dm | 3 +-- 6 files changed, 6 insertions(+), 12 deletions(-) diff --git a/code/modules/mob/living/bot/cleanbot.dm b/code/modules/mob/living/bot/cleanbot.dm index 27a27b59ec3..f60bccbfc32 100644 --- a/code/modules/mob/living/bot/cleanbot.dm +++ b/code/modules/mob/living/bot/cleanbot.dm @@ -128,7 +128,6 @@ update_icons() /mob/living/bot/cleanbot/explode() - . = ..() on = 0 visible_message("[src] blows apart!") var/turf/Tsec = get_turf(src) @@ -142,7 +141,7 @@ s.set_up(3, 1, src) s.start() //qdel(src) - return + return ..() /mob/living/bot/cleanbot/update_icons() if(busy) diff --git a/code/modules/mob/living/bot/ed209bot.dm b/code/modules/mob/living/bot/ed209bot.dm index 4aa9a93c5fe..8700988e592 100644 --- a/code/modules/mob/living/bot/ed209bot.dm +++ b/code/modules/mob/living/bot/ed209bot.dm @@ -27,7 +27,6 @@ icon_state = "ed209[on]" /mob/living/bot/secbot/ed209/explode() - . = ..() visible_message("[src] blows apart!") var/turf/Tsec = get_turf(src) @@ -50,7 +49,7 @@ s.start() new /obj/effect/decal/cleanable/blood/oil(Tsec) - return//qdel(src) + return ..() /mob/living/bot/secbot/ed209/handleRangedTarget() RangedAttack(target) diff --git a/code/modules/mob/living/bot/edCLNbot.dm b/code/modules/mob/living/bot/edCLNbot.dm index 670c550145c..ce0edabe088 100644 --- a/code/modules/mob/living/bot/edCLNbot.dm +++ b/code/modules/mob/living/bot/edCLNbot.dm @@ -50,7 +50,6 @@ src.explode() /mob/living/bot/cleanbot/edCLN/explode() - . = ..() on = 0 visible_message("[src] blows apart!") var/turf/Tsec = get_turf(src) @@ -70,7 +69,7 @@ s.set_up(3, 1, src) s.start() //qdel(src) - return + return ..() /mob/living/bot/cleanbot/edCLN/tgui_data(mob/user) var/list/data = ..() diff --git a/code/modules/mob/living/bot/farmbot.dm b/code/modules/mob/living/bot/farmbot.dm index 8bb7a468bea..969bfc1c831 100644 --- a/code/modules/mob/living/bot/farmbot.dm +++ b/code/modules/mob/living/bot/farmbot.dm @@ -269,7 +269,6 @@ tank.reagents.splash(A, 100) /mob/living/bot/farmbot/explode() - . = ..() visible_message("[src] blows apart!") var/turf/Tsec = get_turf(src) @@ -288,7 +287,7 @@ s.set_up(3, 1, src) s.start() //qdel(src) - return + return ..() /mob/living/bot/farmbot/confirmTarget(var/atom/targ) diff --git a/code/modules/mob/living/bot/floorbot.dm b/code/modules/mob/living/bot/floorbot.dm index 13d2b0977a3..a7a7def771c 100644 --- a/code/modules/mob/living/bot/floorbot.dm +++ b/code/modules/mob/living/bot/floorbot.dm @@ -288,7 +288,6 @@ addTiles(4) /mob/living/bot/floorbot/explode() - . = ..() turn_off() visible_message("\The [src] blows apart!") playsound(src, "sparks", 50, 1) @@ -304,7 +303,7 @@ s.set_up(3, 1, src) s.start() //qdel(src) - return + return ..() /mob/living/bot/floorbot/proc/addTiles(var/am) amount += am diff --git a/code/modules/mob/living/bot/medbot.dm b/code/modules/mob/living/bot/medbot.dm index f1646db5f52..ced48594f1c 100644 --- a/code/modules/mob/living/bot/medbot.dm +++ b/code/modules/mob/living/bot/medbot.dm @@ -328,7 +328,6 @@ ignore_list |= user /mob/living/bot/medbot/explode() - . = ..() on = 0 visible_message("[src] blows apart!") var/turf/Tsec = get_turf(src) @@ -350,7 +349,7 @@ s.set_up(3, 1, src) s.start() //qdel(src) - return + return ..() /mob/living/bot/medbot/handleRegular() . = ..()