Merge remote-tracking branch 'upstream/master' into pull-facing

To trigger the RUSTG CI

code/game/objects/structures.dm

@@ -42,7 +42,7 @@
 
 	do_climb(usr)
 
-/obj/structure/MouseDrop_T(var/atom/movable/C, mob/user as mob)
+/obj/structure/MouseDrop_T(atom/movable/C, mob/user as mob)
 	if(..())
 		return
 	if(C == user)
@@ -57,7 +57,7 @@
 		return T
 	return null
 
-/obj/structure/proc/do_climb(var/mob/living/user)
+/obj/structure/proc/do_climb(mob/living/user)
 	if(!can_touch(user) || !climbable)
 		return
 	var/blocking_object = density_check()
@@ -128,7 +128,7 @@
 			H.UpdateDamageIcon()
 	return
 
-/obj/structure/proc/can_touch(var/mob/user)
+/obj/structure/proc/can_touch(mob/user)
 	if(!user)
 		return 0
 	if(!Adjacent(user))
@@ -167,3 +167,9 @@
 
 /obj/structure/proc/prevents_buckled_mobs_attacking()
 	return FALSE
+
+/obj/structure/zap_act(power, zap_flags)
+	if(zap_flags & ZAP_OBJ_DAMAGE)
+		take_damage(power / 8000, BURN, "energy")
+	power -= power / 2000 //walls take a lot out of ya
+	. = ..()