Merge remote-tracking branch 'remotes/upstream/dev' into 12_7_14_holopad_and_emotes

This commit is contained in:
Neerti
2014-12-10 01:55:50 -05:00
2 changed files with 35 additions and 35 deletions

View File

@@ -316,4 +316,8 @@
"\blue You have unfastened \the [src].", \
"You hear ratchet.")
new /obj/item/pipe(loc, make_from=src)
del(src)
del(src)
/obj/machinery/atmospherics/valve/examine(mob/user)
..()
user << "It is [open ? "open" : "closed"]."