Merge remote-tracking branch 'upstream/master' into terifluff

This commit is contained in:
Terilia
2018-03-13 05:20:20 +00:00
191 changed files with 4901 additions and 445 deletions
+1 -1
View File
@@ -1295,4 +1295,4 @@
righthand_file = 'icons/mob/inhands/fluff_righthand.dmi'
icon_state = "teri_horn"
item_state = "teri_horn"
honk_sound = 'sound/items/teri_horn.ogg'
honk_sound = 'sound/items/teri_horn.ogg'