Merge branch 'master' into bleeding-edge-freeze

This commit is contained in:
Mloc-Argent
2013-07-19 14:48:40 +01:00
52 changed files with 1156 additions and 1287 deletions
+3 -1
View File
@@ -570,10 +570,12 @@
w_class = 3
attack_verb = list("attacked", "slashed", "stabbed", "sliced")
/* NYET.
/obj/item/weapon/toddler
icon_state = "toddler"
name = "toddler"
desc = "This baby looks almost real. Wait, did it just burp?"
force = 5
w_class = 4.0
slot_flags = SLOT_BACK
slot_flags = SLOT_BACK
*/