From 369eba14501eec49b991d408ee254044a6d7432f Mon Sep 17 00:00:00 2001 From: Atermonera Date: Thu, 21 May 2020 20:27:07 -0700 Subject: [PATCH 1/2] Fixes runtime in AI generation --- code/modules/mob/transform_procs.dm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index b41f5da5827..6665d36e802 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -41,7 +41,11 @@ return src +<<<<<<< HEAD /mob/new_player/AIize(var/move) +======= +/mob/new_player/AIize(var/move = TRUE) +>>>>>>> 37d66ca... Fixes runtime in AI generation (#7224) spawning = 1 return ..() @@ -59,7 +63,13 @@ return O //VOREStation Edit End +<<<<<<< HEAD /mob/living/carbon/AIize(var/move) +======= + return ..(move) + +/mob/living/carbon/AIize(var/move = TRUE) +>>>>>>> 37d66ca... Fixes runtime in AI generation (#7224) if (transforming) return for(var/obj/item/W in src) @@ -73,7 +83,7 @@ /mob/proc/AIize(var/move = TRUE) if(client) src << sound(null, repeat = 0, wait = 0, volume = 85, channel = 1) // stop the jams for AIs - + var/newloc = loc if(move) var/obj/loc_landmark From b7605d443c8e20a8965ccd2c03cc5d9bdee8f8a1 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Thu, 21 May 2020 23:44:11 -0400 Subject: [PATCH 2/2] Update transform_procs.dm --- code/modules/mob/transform_procs.dm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index 6665d36e802..bd7c1d0d499 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -41,11 +41,7 @@ return src -<<<<<<< HEAD -/mob/new_player/AIize(var/move) -======= /mob/new_player/AIize(var/move = TRUE) ->>>>>>> 37d66ca... Fixes runtime in AI generation (#7224) spawning = 1 return ..() @@ -63,13 +59,9 @@ return O //VOREStation Edit End -<<<<<<< HEAD -/mob/living/carbon/AIize(var/move) -======= return ..(move) /mob/living/carbon/AIize(var/move = TRUE) ->>>>>>> 37d66ca... Fixes runtime in AI generation (#7224) if (transforming) return for(var/obj/item/W in src)