Merge branch 'master' into more_implants

code/game/objects/items/shields.dm

@@ -236,6 +236,7 @@
 	throwforce = 15 //Massive pice of metal
 	w_class = WEIGHT_CLASS_HUGE
 	item_flags = SLOWS_WHILE_IN_HAND
+  transparent = FALSE
 
 /obj/item/shield/riot/implant
 	name = "riot tower shield"
@@ -252,4 +253,4 @@
 /obj/item/shield/riot/implant/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
 	if(attack_type == PROJECTILE_ATTACK)
 		final_block_chance = 60 //Massive shield
-	return ..()
+	return ..()