diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 1d3450097c..36e4f825da 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -10,6 +10,8 @@ layer = BELOW_OBJ_LAYER armor = list("melee" = 50, "bullet" = 70, "laser" = 70, "energy" = 100, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 0, "acid" = 0) max_integrity = 50 + attack_hand_is_action = TRUE + attack_hand_speed = 8 integrity_failure = 0.4 var/rods_type = /obj/item/stack/rods var/rods_amount = 2 @@ -103,8 +105,6 @@ . = ..() if(.) return - if(!user.CheckActionCooldown(CLICK_CD_MELEE)) - return user.do_attack_animation(src, ATTACK_EFFECT_KICK) user.visible_message("[user] hits [src].", null, null, COMBAT_MESSAGE_RANGE) log_combat(user, src, "hit") diff --git a/code/modules/NTNet/relays.dm b/code/modules/NTNet/relays.dm index 2101a72960..c64e2332cc 100644 --- a/code/modules/NTNet/relays.dm +++ b/code/modules/NTNet/relays.dm @@ -118,4 +118,4 @@ D.target = null D.error = "Connection to quantum relay severed" - return ..() \ No newline at end of file + return ..()