diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 64129a80f7..a7cf63b34b 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -246,11 +246,13 @@ else if(reinf && state == 0) anchored = !anchored update_nearby_icons() + update_verbs() playsound(loc, 'sound/items/Screwdriver.ogg', 75, 1) user << (anchored ? "You have fastened the frame to the floor." : "You have unfastened the frame from the floor.") else if(!reinf) anchored = !anchored update_nearby_icons() + update_verbs() playsound(loc, 'sound/items/Screwdriver.ogg', 75, 1) user << (anchored ? "You have fastened the window to the floor." : "You have unfastened the window.") else if(istype(W, /obj/item/weapon/crowbar) && reinf && state <= 1) @@ -261,6 +263,7 @@ if(!glasstype) user << "You're not sure how to dismantle \the [src] properly." else + playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) visible_message("[user] dismantles \the [src].") if(dir == SOUTHWEST) var/obj/item/stack/material/mats = new glasstype(loc) @@ -288,7 +291,7 @@ return -/obj/structure/window/verb/rotate() +/obj/structure/window/proc/rotate() set name = "Rotate Window Counter-Clockwise" set category = "Object" set src in oview(1) @@ -307,7 +310,7 @@ return -/obj/structure/window/verb/revrotate() +/obj/structure/window/proc/revrotate() set name = "Rotate Window Clockwise" set category = "Object" set src in oview(1) @@ -373,6 +376,15 @@ for(var/obj/structure/window/W in orange(src, 1)) W.update_icon() +//Updates the availabiliy of the rotation verbs +/obj/structure/window/proc/update_verbs() + if(anchored) + verbs -= /obj/structure/window/proc/rotate + verbs -= /obj/structure/window/proc/revrotate + else + verbs += /obj/structure/window/proc/rotate + verbs += /obj/structure/window/proc/revrotate + //merges adjacent full-tile windows into one (blatant ripoff from game/smoothwall.dm) /obj/structure/window/update_icon() //A little cludge here, since I don't know how it will work with slim windows. Most likely VERY wrong.