Merge remote-tracking branch 'upstream/dev-freeze' into dev

Conflicts:
	code/modules/nano/modules/human_appearance.dm
This commit is contained in:
PsiOmegaDelta
2015-06-22 16:59:19 +02:00
14 changed files with 111 additions and 125 deletions
@@ -62,6 +62,12 @@
name = "[material.display_name] [initial(name)]"
desc += " It's made of [material.use_name]."
/obj/structure/bed/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
if(istype(mover) && mover.checkpass(PASSTABLE))
return 1
else
return ..()
/obj/structure/bed/ex_act(severity)
switch(severity)
if(1.0)