Merge pull request #7441 from sabiram/dev-freeze

Adds 'me' hotkey again, corrects hotkeys-help, typo fixes.
This commit is contained in:
PsiOmegaDelta
2014-12-13 14:59:41 +01:00
4 changed files with 9 additions and 4 deletions

View File

@@ -313,7 +313,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/orange
name = "orange"
desc = "It's an tangy fruit."
desc = "It's a tangy fruit."
icon_state = "orange"
potency = 20
filling_color = "#FAAD28"