Merge remote-tracking branch 'VOREStation/master' into making-of-shadekin

This commit is contained in:
Unknown
2019-11-15 12:12:55 -05:00
265 changed files with 42131 additions and 36340 deletions
+9 -1
View File
@@ -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)