cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-12 07:35:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update transform_procs.dm

Browse Source
This commit is contained in:
Aronai Sieyes
2020-05-21 23:44:11 -04:00
committed by GitHub
parent 369eba1450
commit b7605d443c
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/transform_procs.dm
-8
View File
@@ -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)