diff --git a/code/game/objects/items/weapons/vaurca_items.dm b/code/game/objects/items/weapons/vaurca_items.dm index 3bc7dbb0d66..5e97dfe45a7 100644 --- a/code/game/objects/items/weapons/vaurca_items.dm +++ b/code/game/objects/items/weapons/vaurca_items.dm @@ -333,7 +333,7 @@ recoil = 6 - release_speed = 15 + release_speed = 5 var/list/belt = new/list() var/belt_size = 12 //holds this + one in the chamber recoil_wielded = 2 @@ -384,20 +384,22 @@ if(bolt) if(tension < max_tension) - M << "You pump [src], charging the magnetic coils." - tension++ + if(do_after(M, 5 * tension)) + M << "You pump [src], charging the magnetic coils." + tension++ else M << "\The [src]'s magnetic coils are at maximum charge." return var/obj/item/next if(belt.len) next = belt[1] - if(next) - belt -= next //Remove grenade from loaded list. - bolt = next - M << "You pump [src], loading \a [next] into the chamber." - else - M << "You pump [src], but the magazine is empty." + if(do_after(M, 10)) + if(next) + belt -= next //Remove grenade from loaded list. + bolt = next + M << "You pump [src], loading \a [next] into the chamber." + else + M << "You pump [src], but the magazine is empty." /obj/item/weapon/gun/launcher/crossbow/vaurca/proc/load(obj/item/W, mob/user) if(belt.len >= belt_size) diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index 57d9eb4b822..06e3d504342 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -449,7 +449,7 @@ /obj/item/weapon/flag/america name = "Old World flag" desc = "The banner of an ancient nation, its glory old." - flag_path = "soldglory" + flag_path = "oldglory" /obj/item/weapon/flag/america/l flag_size = 1 diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 104ea27c169..672321a21b3 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -518,7 +518,7 @@ var/list/mineral_can_smooth_with = list( user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) if(ishuman(user)) - var/mob/living/carbon/human/H + var/mob/living/carbon/human/H = user var/turf/destination = GetAbove(H) if(destination) diff --git a/code/modules/mob/living/carbon/human/human_powers.dm b/code/modules/mob/living/carbon/human/human_powers.dm index 67a69631dff..a2b0d3c8236 100644 --- a/code/modules/mob/living/carbon/human/human_powers.dm +++ b/code/modules/mob/living/carbon/human/human_powers.dm @@ -688,9 +688,6 @@ if (istype(T) && (T:l_ear || T:r_ear) && istype((T:l_ear || T:r_ear), /obj/item/clothing/ears/earmuffs)) continue - if (!vampire_can_affect_target(T, 0)) - continue - to_chat(T, "You hear an ear piercing shriek and feel your senses go dull!") T.Weaken(5) T.ear_deaf = 20 diff --git a/code/modules/multiz/movement.dm b/code/modules/multiz/movement.dm index d2b58d88cd3..5028102a7cb 100644 --- a/code/modules/multiz/movement.dm +++ b/code/modules/multiz/movement.dm @@ -145,8 +145,14 @@ return if(destination.density) + to_chat(src, "There is something obstructing your destination!") return + for(var/obj/O in destination) + if(O.density) + to_chat(src, "There is something obstructing your destination!") + return + visible_message("The [src] begins to climb [(direction == UP) ? "upwards" : "downwards"].", "You begin to climb [(direction == UP) ? "upwards" : "downwards"].") var/climb_chance = 50