diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm index bc1bfe6135b..7a1dbdf91d9 100644 --- a/code/game/machinery/computer/camera_advanced.dm +++ b/code/game/machinery/computer/camera_advanced.dm @@ -75,7 +75,7 @@ for(var/obj/machinery/camera/C in GLOB.cameranet.cameras) if(!C.can_use()) continue - if(C.network&networks) + if(length(C.network & networks)) camera_location = get_turf(C) break if(camera_location) diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index 9ed97abb045..26af8fd9ac2 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -19,7 +19,7 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \ new/datum/stack_recipe/window("fulltile window", /obj/structure/window/full/basic, 2, time = 0, on_floor = TRUE, window_checks = TRUE), \ new/datum/stack_recipe("fishbowl", /obj/machinery/fishtank/bowl, 1, time = 10), \ new/datum/stack_recipe("fish tank", /obj/machinery/fishtank/tank, 3, time = 20, on_floor = TRUE), \ - new/datum/stack_recipe("wall aquariam", /obj/machinery/fishtank/wall, 4, time = 40, on_floor = TRUE) \ + new/datum/stack_recipe("wall aquarium", /obj/machinery/fishtank/wall, 4, time = 40, on_floor = TRUE) \ )) /obj/item/stack/sheet/glass diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 9e944853a0f..4cda181ee4f 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -551,7 +551,7 @@ /obj/item/robot_module/miner/handle_custom_removal(component_id, mob/living/user, obj/item/W) if(component_id == "KA modkits") for(var/obj/item/gun/energy/kinetic_accelerator/cyborg/D in src) - D.attackby(W, user) + D.crowbar_act(user, W) return TRUE return ..() diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index a0e7b47da13..25c83556882 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -137,7 +137,6 @@ */ /obj/item/pen/edagger origin_tech = "combat=3;syndicate=1" - attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") //these wont show up if the pen is off var/on = 0 var/brightness_on = 2 light_color = LIGHT_COLOR_RED @@ -149,6 +148,7 @@ sharp = 0 w_class = initial(w_class) name = initial(name) + attack_verb = list() hitsound = initial(hitsound) embed_chance = initial(embed_chance) throwforce = initial(throwforce) @@ -161,6 +161,7 @@ sharp = 1 w_class = WEIGHT_CLASS_NORMAL name = "energy dagger" + attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") hitsound = 'sound/weapons/blade1.ogg' embed_chance = 100 //rule of cool throwforce = 35 diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm index c5bf8a131bb..8a30d27517a 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm @@ -275,7 +275,7 @@ return ..() /obj/item/borg/upgrade/modkit/action(mob/living/silicon/robot/R) - if(..()) + if(!..()) return for(var/obj/item/gun/energy/kinetic_accelerator/cyborg/H in R.module.modules) diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm index 1c6981ff0b5..52a54e47a3b 100644 --- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm +++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm @@ -246,7 +246,7 @@ if(!operating) for (var/obj/item/O in holdingitems) - processing_chamber += "\A [O.name]
" + processing_chamber += "\A [html_encode(O.name)]
" if (!processing_chamber) is_chamber_empty = 1