Merge remote-tracking branch 'upstream/master' into newnew-clock-misc-stuff

This commit is contained in:
DeltaFire
2020-08-04 17:30:38 +02:00
200 changed files with 2412 additions and 1087 deletions
@@ -62,7 +62,7 @@
hitsound = null
attack_verb_on = list("slipped")
clumsy_check = FALSE
sharpness = IS_BLUNT
sharpness = SHARP_NONE
sword_color = "yellow"
heat = 0
light_color = "#ffff00"