diff --git a/code/game/gamemodes/vampire/vampire_powers.dm b/code/game/gamemodes/vampire/vampire_powers.dm index 12dbbec9..91b6337d 100644 --- a/code/game/gamemodes/vampire/vampire_powers.dm +++ b/code/game/gamemodes/vampire/vampire_powers.dm @@ -223,8 +223,8 @@ C.stuttering = 20 C.Stun(8) // C.Jitter(150) -// for(var/obj/structure/window/W in view(4)) -// W.destroy() + for(var/obj/structure/window/W in view(4)) + W.destroy() playsound(M.current.loc, 'sound/effects/creepyshriek.ogg', 100, 1) M.current.remove_vampire_blood(30) M.current.verbs -= /client/vampire/proc/vampire_screech diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 218b478d..85292bd8 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -371,7 +371,7 @@ G.affecting.loc = src.loc G.affecting.Weaken(5) visible_message("\red [G.assailant] puts [G.affecting] on \the [src].") - del(W) + del(W) return if (istype(W, /obj/item/weapon/wrench)) @@ -422,6 +422,27 @@ return 0 return 1 + +/obj/structure/table/verb/do_climb() + set name = "Climb table" + set desc = "Climbs onto a table." + set category = "Object" + set src in oview(1) + + if (!can_touch(usr)) + return + + usr.visible_message("[usr] starts climbing onto \the [src]!") + + if(!do_after(usr,50)) + return + + usr.loc = get_turf(src) + for(var/mob/living/M in get_turf(src)) + M.Weaken(5) + if (get_turf(usr) == get_turf(src)) + usr.visible_message("[usr] climbs onto \the [src]!") + /obj/structure/table/verb/do_flip() set name = "Flip table" set desc = "Flips a non-reinforced table" @@ -435,6 +456,9 @@ usr << "It won't budge." else usr.visible_message("[usr] flips \the [src]!") + for(var/mob/living/M in get_turf(src)) + M.Weaken(5) + M << "\red You topple as \the [src] moves under you!" return /obj/structure/table/proc/unflipping_check(var/direction) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 798060f8..400f82aa 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -32,6 +32,13 @@ return +// This should result in the same materials used to make the window. +/obj/structure/window/proc/destroy() + new /obj/item/weapon/shard(loc) + if(reinf) + new /obj/item/stack/rods(loc) + del(src) + /obj/structure/window/ex_act(severity) switch(severity) if(1.0)