diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index e006b28c40f..00b0caba1d9 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -50,7 +50,7 @@ var/list/doppler_arrays = list() /obj/machinery/doppler_array/AltClick(mob/user) ..() - if(!user.canUseTopic(user)) + if(user.incapacitated()) user << "You can't do that right now!" return if(!in_range(src, user)) diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index 78adee3d5b0..4f45e21b8d4 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -171,7 +171,7 @@ var/global/list/pipeID2State = list( /obj/item/pipe/AltClick(mob/user) ..() - if(!user.canUseTopic(user)) + if(user.incapacitated()) user << "You can't do that right now!" return if(!in_range(src, user)) diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index 34afa00a980..c6c7f169a30 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -75,7 +75,7 @@ /obj/structure/bed/chair/AltClick(mob/user) ..() - if(!user.canUseTopic(user)) + if(user.incapacitated()) user << "You can't do that right now!" return if(!in_range(src, user)) diff --git a/code/game/objects/structures/transit_tubes/transit_tube_construction.dm b/code/game/objects/structures/transit_tubes/transit_tube_construction.dm index 93aa2afe775..772b8e33c1b 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube_construction.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube_construction.dm @@ -49,14 +49,14 @@ set category = "Object" set src in view(1) - if(!usr.canUseTopic(src)) + if(usr.incapacitated()) return tube_turn(-90) /obj/structure/c_transit_tube/AltClick(mob/user) ..() - if(!user.canUseTopic(user)) + if(user.incapacitated()) user << "You can't do that right now!" return if(!in_range(src, user)) @@ -69,7 +69,7 @@ set category = "Object" set src in view(1) - if(!usr.canUseTopic(src)) + if(usr.incapacitated()) return tube_turn(90) @@ -79,7 +79,7 @@ set category = "Object" set src in view(1) - if(!usr.canUseTopic(src)) + if(usr.incapacitated()) return tube_flip() diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm index 39a0544523d..ba1f9b119cd 100644 --- a/code/game/objects/structures/windoor_assembly.dm +++ b/code/game/objects/structures/windoor_assembly.dm @@ -329,7 +329,7 @@ /obj/structure/windoor_assembly/AltClick(mob/user) ..() - if(!user.canUseTopic(user)) + if(user.incapacitated()) user << "You can't do that right now!" return if(!in_range(src, user)) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 9fabe3d82fe..cb0c4bc4957 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -348,7 +348,7 @@ /obj/structure/window/AltClick(mob/user) ..() - if(!user.canUseTopic(user)) + if(user.incapacitated()) user << "You can't do that right now!" return if(!in_range(src, user)) diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index 8b3fd683db2..e1260d519cd 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -146,7 +146,7 @@ /obj/item/device/assembly/infra/AltClick(mob/user) ..() - if(!user.canUseTopic(user)) + if(user.incapacitated()) user << "You can't do that right now!" return if(!in_range(src, user)) diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 673767faa5c..deab9fd0fa3 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -62,7 +62,7 @@ /obj/machinery/power/emitter/AltClick(mob/user) ..() - if(!user.canUseTopic(user)) + if(user.incapacitated()) user << "You can't do that right now!" return if(!in_range(src, user)) diff --git a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm index 99ec21831a9..c9f6d832c5e 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm @@ -107,7 +107,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin /obj/structure/particle_accelerator/AltClick(mob/user) ..() - if(!user.canUseTopic(user)) + if(user.incapacitated()) user << "You can't do that right now!" return if(!in_range(src, user)) diff --git a/code/modules/recycling/disposal-construction.dm b/code/modules/recycling/disposal-construction.dm index 20cb7d40710..5d869bde26c 100644 --- a/code/modules/recycling/disposal-construction.dm +++ b/code/modules/recycling/disposal-construction.dm @@ -110,7 +110,7 @@ /obj/structure/disposalconstruct/AltClick(mob/user) ..() - if(!user.canUseTopic(user)) + if(user.incapacitated()) user << "You can't do that right now!" return if(!in_range(src, user))