Merge remote-tracking branch 'upstream/master' into universal-damage

code/game/objects/items/devices/lightreplacer.dm

@@ -238,6 +238,7 @@
 		return 0
 
 /obj/item/lightreplacer/afterattack(atom/T, mob/U, proximity)
+	. = ..()
 	if(!proximity)
 		return
 	if(!isturf(T))

code/game/objects/items/weapons/shields.dm

@@ -58,7 +58,7 @@
 
 /obj/item/shield/energy
 	name = "energy combat shield"
-	desc = "A shield capable of stopping most melee attacks. Protects user from almost all energy projectiles. It can be retracted, expanded, and stored anywhere."
+	desc = "A shield that reflects almost all energy projectiles, but is useless against physical attacks. It can be retracted, expanded, and stored anywhere."
 	icon_state = "eshield0" // eshield1 for expanded
 	force = 3
 	throwforce = 3