diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index c62df2f6cca..a12f804d308 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -66,6 +66,14 @@ handle_rotation() return +/obj/structure/stool/bed/chair/AltClick(mob/user) + if(user.incapacitated()) + to_chat(user, "You can't do that right now!") + return + if(!Adjacent(user)) + return + rotate() + // Chair types /obj/structure/stool/bed/chair/wood // TODO: Special ash subtype that looks like charred chair legs diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm index 47e0823f549..4e41daef289 100644 --- a/code/game/objects/structures/windoor_assembly.dm +++ b/code/game/objects/structures/windoor_assembly.dm @@ -322,6 +322,14 @@ obj/structure/windoor_assembly/Destroy() update_icon() return +/obj/structure/windoor_assembly/AltClick(mob/user) + if(user.incapacitated()) + to_chat(user, "You can't do that right now!") + return + if(!Adjacent(user)) + return + revrotate() + //Flips the windoor assembly, determines whather the door opens to the left or the right /obj/structure/windoor_assembly/verb/flip() set name = "Flip Windoor Assembly" diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 2293e04a746..7ae2ddcd27d 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -318,6 +318,14 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f return +/obj/structure/window/AltClick(mob/user) + if(user.incapacitated()) + to_chat(user, "You can't do that right now!") + return + if(!Adjacent(user)) + return + revrotate() + /* /obj/structure/window/proc/updateSilicate() if(silicateIcon && silicate) diff --git a/code/modules/pda/PDA.dm b/code/modules/pda/PDA.dm index 9da5c8e6cb1..fafa27a24f7 100755 --- a/code/modules/pda/PDA.dm +++ b/code/modules/pda/PDA.dm @@ -300,15 +300,16 @@ var/global/list/obj/item/device/pda/PDAs = list() else to_chat(usr, "You cannot do this while restrained.") -/obj/item/device/pda/AltClick() +/obj/item/device/pda/AltClick(mob/user) + ..() if(issilicon(usr)) return - if(can_use(usr)) + if(can_use(user)) if(id) remove_id() else - usr << "This PDA does not have an ID in it!" + to_chat(user, "This PDA does not have an ID in it!") /obj/item/device/pda/proc/remove_id() if(id) diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 89119df21a8..2493e492d48 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -70,6 +70,14 @@ src.dir = turn(src.dir, 90) return 1 +/obj/machinery/power/emitter/AltClick(mob/user) + if(user.incapacitated()) + to_chat(user, "You can't do that right now!") + return + if(!Adjacent(user)) + return + rotate() + /obj/machinery/power/emitter/initialize() ..() if(state == 2 && anchored) diff --git a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm index 051440525f3..a75bdd3ec80 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm @@ -101,6 +101,14 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin src.dir = turn(src.dir, 270) return 1 +/obj/structure/particle_accelerator/AltClick(mob/user) + if(user.incapacitated()) + to_chat(user, "You can't do that right now!") + return + if(!Adjacent(user)) + return + rotate() + /obj/structure/particle_accelerator/verb/rotateccw() set name = "Rotate Counter Clockwise" set category = "Object" diff --git a/code/modules/recycling/disposal-construction.dm b/code/modules/recycling/disposal-construction.dm index 948973bc3bc..4e720f39c00 100644 --- a/code/modules/recycling/disposal-construction.dm +++ b/code/modules/recycling/disposal-construction.dm @@ -96,6 +96,14 @@ dir = turn(dir, -90) update() +/obj/structure/disposalconstruct/AltClick(mob/user) + if(user.incapacitated()) + to_chat(user << "You can't do that right now!") + return + if(!Adjacent(user)) + return + rotate() + /obj/structure/disposalconstruct/verb/flip() set name = "Flip Pipe" set src in view(1)