diff --git a/code/game/objects/items/apc_frame.dm b/code/game/objects/items/apc_frame.dm
index 4b69e5db7c..fd2ea3e94b 100644
--- a/code/game/objects/items/apc_frame.dm
+++ b/code/game/objects/items/apc_frame.dm
@@ -13,31 +13,31 @@
new /obj/item/stack/material/steel( get_turf(src.loc), 2 )
qdel(src)
-/obj/item/frame/apc/try_build(turf/on_wall)
- if (get_dist(on_wall,usr)>1)
+/obj/item/frame/apc/try_build(turf/on_wall, mob/user as mob)
+ if (get_dist(on_wall, user)>1)
return
- var/ndir = get_dir(usr,on_wall)
+ var/ndir = get_dir(user, on_wall)
if (!(ndir in cardinal))
return
- var/turf/loc = get_turf(usr)
+ var/turf/loc = get_turf(user)
var/area/A = loc.loc
if (!istype(loc, /turf/simulated/floor))
- usr << "APC cannot be placed on this spot."
+ to_chat(user, "APC cannot be placed on this spot.")
return
if (A.requires_power == 0 || istype(A, /area/space))
- usr << "APC cannot be placed in this area."
+ to_chat(user, "APC cannot be placed in this area.")
return
if (A.get_apc())
- usr << "This area already has an APC."
+ to_chat(user, "This area already has an APC.")
return //only one APC per area
for(var/obj/machinery/power/terminal/T in loc)
if (T.master)
- usr << "There is another network terminal here."
+ to_chat(user, "There is another network terminal here.")
return
else
var/obj/item/stack/cable_coil/C = new /obj/item/stack/cable_coil(loc)
C.amount = 10
- usr << "You cut the cables and disassemble the unused power terminal."
+ to_chat(user, "You cut the cables and disassemble the unused power terminal.")
qdel(T)
new /obj/machinery/power/apc(loc, ndir, 1)
qdel(src)
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index cbaf8f8cf8..3186e26e0e 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -311,7 +311,7 @@
qdel(src)
else if(istype(W,/obj/item/frame) && anchored)
var/obj/item/frame/F = W
- F.try_build(src)
+ F.try_build(src, user)
else
user.setClickCooldown(user.get_attack_speed(W))
if(W.damtype == BRUTE || W.damtype == BURN)
diff --git a/code/game/turfs/simulated/wall_attacks.dm b/code/game/turfs/simulated/wall_attacks.dm
index 01633b65d3..2bfa5a6aca 100644
--- a/code/game/turfs/simulated/wall_attacks.dm
+++ b/code/game/turfs/simulated/wall_attacks.dm
@@ -355,7 +355,7 @@
if(istype(W,/obj/item/frame))
var/obj/item/frame/F = W
- F.try_build(src)
+ F.try_build(src, user)
return
else if(!istype(W,/obj/item/weapon/rcd) && !istype(W, /obj/item/weapon/reagent_containers))