Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into map

# Conflicts:
#	code/game/machinery/vending_yw.dm
#	icons/vore/custom_clothes_yw.dmi
#	vorestation.dme

code/game/objects/structures/catwalk.dm

@@ -87,6 +87,12 @@
 	return ..()
 
 /obj/structure/catwalk/Crossed()
+	//VOREStation Edit begin: SHADEKIN
+	var/mob/SK = usr
+	if(istype(SK))
+		if(SK.shadekin_phasing_check())
+			return
+	//VOREStation Edit end: SHADEKIN
 	. = ..()
 	if(isliving(usr))
 		playsound(src, pick('sound/effects/footstep/catwalk1.ogg', 'sound/effects/footstep/catwalk2.ogg', 'sound/effects/footstep/catwalk3.ogg', 'sound/effects/footstep/catwalk4.ogg', 'sound/effects/footstep/catwalk5.ogg'), 25, 1)

code/game/objects/structures/girders.dm

@@ -38,7 +38,7 @@
 	if(!total_radiation)
 		return
 
-	radiation_repository.radiate(src, total_radiation)
+	SSradiation.radiate(src, total_radiation)
 	return total_radiation
 
 
@@ -62,7 +62,7 @@
 
 /obj/structure/girder/update_icon()
 	if(anchored)
-		icon_state = "girder"
+		icon_state = initial(icon_state)
 	else
 		icon_state = "displaced"
 
@@ -320,6 +320,7 @@
 	name = "column"
 	icon= 'icons/obj/cult.dmi'
 	icon_state= "cultgirder"
+	max_health = 250
 	health = 250
 	cover = 70
 	girder_material = "cult"
@@ -354,6 +355,13 @@
 		new /obj/effect/decal/remains/human(get_turf(src))
 		dismantle()
 
+/obj/structure/girder/resin
+	name = "soft girder"
+	icon_state = "girder_resin"
+	max_health = 225
+	health = 225
+	cover = 60
+	girder_material = "resin"
 
 /obj/structure/girder/rcd_values(mob/living/user, obj/item/weapon/rcd/the_rcd, passed_mode)
 	var/turf/simulated/T = get_turf(src)

code/game/objects/structures/simple_doors.dm

@@ -196,7 +196,7 @@
 /obj/structure/simple_door/process()
 	if(!material.radioactivity)
 		return
-	radiation_repository.radiate(src, round(material.radioactivity/3))
+	SSradiation.radiate(src, round(material.radioactivity/3))
 
 /obj/structure/simple_door/iron/New(var/newloc,var/material_name)
 	..(newloc, "iron")