From eb51376128c985459ccc33f5a064bd75256c0eac Mon Sep 17 00:00:00 2001 From: "C.L" Date: Sat, 8 Oct 2022 19:08:53 -0400 Subject: [PATCH] Update mob_defines.dm --- code/modules/mob/mob_defines.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index d43027e2ff5..ceb49fa47ae 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -230,11 +230,7 @@ var/registered_z var/in_enclosed_vehicle = 0 //For mechs and fighters ambiance. Can be used in other cases. -<<<<<<< HEAD var/list/progressbars = null //VOREStation Edit - var/datum/focus //What receives our keyboard inputs. src by default // VOREStation Add - Key Handling -======= var/datum/focus //What receives our keyboard inputs. src by default ->>>>>>> c463104999a... Ports Diagonal Movement (#8199)