diff --git a/code/game/atoms_movable_movement.dm b/code/game/atoms_movable_movement.dm index 8675493bf5b..c8cb6f8a018 100644 --- a/code/game/atoms_movable_movement.dm +++ b/code/game/atoms_movable_movement.dm @@ -184,24 +184,22 @@ CRASH("Bump was called with no argument.") SEND_SIGNAL(src, COMSIG_MOVABLE_BUMP, A) . = ..() - if(!QDELETED(throwing)) - throwing.hit_atom(A) - . = TRUE - if(QDELETED(A)) - return - A.Bumped(src) - -/atom/movable/Bump(atom/A) - if(!A) - CRASH("Bump was called with no argument.") - . = ..() + // vore code if(throwing) throw_impact(A) throwing = 0 if(QDELETED(A)) return - A.Bumped(src) A.last_bumped = world.time + // vore code end +/* + if(!QDELETED(throwing)) + throwing.hit_atom(A) + . = TRUE + if(QDELETED(A)) + return +*/ + A.Bumped(src) /atom/movable/proc/forceMove(atom/destination) . = FALSE diff --git a/code/modules/admin/view_variables/helpers_LEGACY.dm b/code/modules/admin/view_variables/helpers_LEGACY.dm index 40a098cb708..56047d6445c 100644 --- a/code/modules/admin/view_variables/helpers_LEGACY.dm +++ b/code/modules/admin/view_variables/helpers_LEGACY.dm @@ -1,5 +1,5 @@ -/atom/get_view_variables_header_legacy() +/datum/proc/get_view_variables_header_legacy() return "" /mob/living/get_view_variables_header_legacy() diff --git a/code/modules/admin/view_variables/modify_variables.dm b/code/modules/admin/view_variables/modify_variables.dm index 20645d4bfcf..ae14b01e1fd 100644 --- a/code/modules/admin/view_variables/modify_variables.dm +++ b/code/modules/admin/view_variables/modify_variables.dm @@ -4,6 +4,8 @@ GLOBAL_LIST_INIT(VVicon_edit_lock, list("icon", "icon_state", "overlays", "under GLOBAL_PROTECT(VVicon_edit_lock) GLOBAL_LIST_INIT(VVckey_edit, list("key", "ckey")) //Requires DEBUG or SPAWN GLOBAL_PROTECT(VVckey_edit) +GLOBAL_LIST_INIT(VVpixelmovement, list("bound_x", "bound_y", "step_x", "step_y", "step_size", "bound_height", "bound_width", "bounds")) +GLOBAL_PROTECT(VVpixelmovement) /client/proc/vv_parse_text(O, new_var) if(O && findtext(new_var,"\["))