Merge pull request #529 from Fox-McCloud/Crayons

Crayons and Gloves
This commit is contained in:
ZomgPonies
2015-03-08 13:24:05 -04:00
36 changed files with 297 additions and 241 deletions
+1 -1
View File
@@ -55,7 +55,7 @@
/obj/item/weapon/stamp/cmo
name = "chief medical officer's rubber stamp"
icon_state = "stamp-cmo"
_color = "cmo"
_color = "medical"
/obj/item/weapon/stamp/granted
name = "\improper GRANTED rubber stamp"