Merge branch 'master' into master

This commit is contained in:
Thalpy
2019-08-05 09:09:36 +01:00
committed by GitHub
250 changed files with 5984 additions and 3941 deletions
@@ -226,7 +226,7 @@
/datum/gear/darksabre
name = "Dark Sabre"
category = SLOT_IN_BACKPACK
path = /obj/item/toy/sword/darksabre
path = /obj/item/toy/darksabre
ckeywhitelist = list("inferno707")
datum/gear/darksabresheath