diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index 297f3efe7a7..162c8de6f91 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -74,7 +74,7 @@ /obj/machinery/nuclearbomb/Topic(href, href_list) ..() - if (usr.stat || usr.restrained()) + if (!usr.canmove || usr.stat || usr.restrained()) return if (!ishuman(usr)) usr << "\red You don't have the dexterity to do this!" diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index b4b2830cbf8..582f5f2367c 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -44,7 +44,7 @@ /obj/machinery/pipedispenser/Topic(href, href_list) if(..()) return - if(unwrenched) + if(unwrenched || !usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr)) usr << browse(null, "window=pipedispenser") return usr.machine = src @@ -133,6 +133,9 @@ usr.machine = src src.add_fingerprint(usr) if(href_list["dmake"]) + if(unwrenched || !usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr)) + usr << browse(null, "window=pipedispenser") + return if(!wait) var/p_type = text2num(href_list["dmake"]) var/obj/structure/disposalconstruct/C = new (src.loc) diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm index 798a04a3c91..57514f85985 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_control.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm @@ -93,7 +93,7 @@ part.update_icon() else if(href_list["strengthdown"]) - strength++ + strength-- if(strength < 0) strength = 0 else diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi index 88867c30b39..08068759ea3 100644 Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ