Merge branch 'master' of https://github.com/tgstation/tgstation into misc_span_fixes1

# Conflicts:
#	code/game/objects/items/devices/PDA/PDA.dm
#	code/modules/mob/dead/new_player/new_player.dm

code/modules/mining/equipment/goliath_hide.dm

@@ -1,12 +0,0 @@
-/**********************Goliath Hide**********************/
-/obj/item/stack/sheet/animalhide/goliath_hide
-	name = "goliath hide plates"
-	desc = "Pieces of a goliath's rocky hide, these might be able to make your suit a bit more durable to attack from the local fauna."
-	icon = 'icons/obj/mining.dmi'
-	icon_state = "goliath_hide"
-	singular_name = "hide plate"
-	max_amount = 6
-	novariants = FALSE
-	item_flags = NOBLUDGEON
-	w_class = WEIGHT_CLASS_NORMAL
-	layer = MOB_LAYER