diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 4c83e33eced..289edff4bd0 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -208,19 +208,20 @@ if(req_components[R] > 0) component_check = 0 break - if(component_check) - I.play_tool_sound(src) - var/obj/machinery/new_machine = new circuit.build_path(loc) - new_machine.on_construction() - for(var/obj/O in new_machine.component_parts) - qdel(O) - new_machine.component_parts = list() - for(var/obj/O in src) - O.loc = null - new_machine.component_parts += O - circuit.loc = null - new_machine.RefreshParts() - qdel(src) + if(!component_check) + return TRUE + I.play_tool_sound(src) + var/obj/machinery/new_machine = new circuit.build_path(loc) + new_machine.on_construction() + for(var/obj/O in new_machine.component_parts) + qdel(O) + new_machine.component_parts = list() + for(var/obj/O in src) + O.loc = null + new_machine.component_parts += O + circuit.loc = null + new_machine.RefreshParts() + qdel(src) return TRUE diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index 4e8317ee6ac..129640a4a02 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -205,7 +205,7 @@ for(var/obj/O in beakers) if(!O.reagents) continue - if(istype(O,/obj/item/slime_extract)) + if(istype(O, /obj/item/slime_extract)) cores += " [O]" for(var/R in O.reagents.reagent_list) var/datum/reagent/reagent = R diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index 84fe30616e2..b38335df9d0 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -119,18 +119,18 @@ /obj/structure/falsewall/screwdriver_act(mob/living/user, obj/item/I) if(opening) to_chat(user, "You must wait until the door has stopped moving.") - return + return TRUE if(!density) to_chat(user, "You can't reach, close it first!") - return + return TRUE var/turf/T = get_turf(src) if(T.density) to_chat(user, "[src] is blocked!") - return + return TRUE if(!istype(T, /turf/simulated/floor)) to_chat(user, "[src] bolts must be tightened on the floor!") - return + return TRUE user.visible_message("[user] tightens some bolts on the wall.", "You tighten the bolts on the wall.") ChangeToWall() return TRUE diff --git a/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm b/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm index d7a47cbb447..f8bf94934bd 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm @@ -140,7 +140,7 @@ user.visible_message("[user] starts to fix part of [src].", "You start to fix part of [src].") if(do_after(user, 20 * I.toolspeed, target = src)) I.play_tool_sound(src) - user.visible_message("[user] fixes part of [src].", "You have fixed part of \the [src].") + user.visible_message("[user] fixes part of [src].", "You have fixed part of [src].") broken = 1 // Fix it a bit return TRUE