Merge branch 'master' of https://github.com/tgstation/-tg-station into SpaceCarpTatorItem

This commit is contained in:
CosmicScientist
2015-04-11 22:11:10 +01:00
16 changed files with 1253 additions and 1 deletions
+5
View File
@@ -56,6 +56,11 @@
/obj/structure/alien/resin/wall/BlockSuperconductivity()
return 1
/obj/structure/alien/resin/wall/shadowling //For chrysalis
name = "chrysalis wall"
desc = "Some sort of purple substance in an egglike shape. It pulses and throbs from within and seems impenetrable."
health = INFINITY
/obj/structure/alien/resin/membrane
name = "resin membrane"
desc = "Resin just thin enough to let light pass through."