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

This commit is contained in:
Segrain
2013-10-11 12:44:44 +03:00
8 changed files with 13 additions and 11 deletions
+1 -1
View File
@@ -16,7 +16,7 @@
pressure_resistance = 1
slot_flags = SLOT_HEAD
body_parts_covered = HEAD
attack_verb = list("")
attack_verb = list("bapped")
var/info //What's actually written on the paper.
var/info_links //A different version of the paper which includes html links at fields and EOF