diff --git a/code/game/atoms.dm b/code/game/atoms.dm index b7147a80ab8..8ffb442cbf2 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -15,7 +15,6 @@ var/list/blood_DNA var/blood_color - var/last_bumped = 0 var/pass_flags = 0 var/germ_level = GERM_LEVEL_AMBIENT // The higher the germ level, the more germ on the atom. var/simulated = TRUE //filter for actions - used by lighting overlays diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index fe281816f5b..fae088cfd08 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -105,9 +105,6 @@ return if(isliving(AM)) var/mob/living/M = AM - if(world.time - M.last_bumped <= 10) - return //Can bump-open one airlock per second. This is to prevent shock spam. - M.last_bumped = world.time if(M.restrained() && !check_access(null)) return if(M.mob_size > MOB_SIZE_TINY) @@ -117,9 +114,6 @@ if(ismecha(AM)) var/obj/mecha/mecha = AM if(density) - if(mecha.occupant) - if(world.time - mecha.occupant.last_bumped <= 10) - return if(mecha.occupant && allowed(mecha.occupant) || check_access_list(mecha.operation_req_access)) if(HAS_TRAIT(src, TRAIT_CMAGGED)) cmag_switch(FALSE, mecha.occupant) diff --git a/code/game/objects/structures/aliens.dm b/code/game/objects/structures/aliens.dm index 2fead53a9a3..b400bf6a4ba 100644 --- a/code/game/objects/structures/aliens.dm +++ b/code/game/objects/structures/aliens.dm @@ -160,8 +160,6 @@ return var/mob/living/carbon/C = user if(C.get_int_organ(/obj/item/organ/internal/alien/hivenode)) - if(world.time - C.last_bumped <= 60) - return if(!C.handcuffed) operate() return diff --git a/code/game/objects/structures/inflatable.dm b/code/game/objects/structures/inflatable.dm index dc1b8c87a1b..9d2860fd774 100644 --- a/code/game/objects/structures/inflatable.dm +++ b/code/game/objects/structures/inflatable.dm @@ -128,8 +128,6 @@ return if(ismob(user)) var/mob/M = user - if(world.time - user.last_bumped <= 60) - return //NOTE do we really need that? if(M.client) if(iscarbon(M)) var/mob/living/carbon/C = M