Baystation12/Baystation12 — pull request #1554 by Nerezza (2012-07-30 15:20:24+00:00)
Title: Asher Spock's custom items.

There, I'm thinking this'll merge. Like last time I didn't touch custom_items.txt so someone needs to add in the lines

nerezza: Asher Spock: /obj/item/weapon/reagent_containers/hypospray/fluff/asher_spock_1
and
nerezza: Asher Spock: /obj/item/weapon/card/id/fluff/asher_spock_2