Merge remote-tracking branch 'refs/remotes/origin/master' into beepboop

This commit is contained in:
Poojawa
2018-03-20 23:00:12 -05:00
1355 changed files with 3112 additions and 2226 deletions
@@ -209,7 +209,7 @@
name = "Puffy Dress"
category = slot_wear_suit
path = /obj/item/clothing/suit/puffydress
//ckeywhitelist = //Don't know their ckey yet
ckeywhitelist = list("stallingratt")
/datum/gear/labredblack
name = "Black and Red Coat"
@@ -217,6 +217,18 @@
path = /obj/item/clothing/suit/toggle/labcoat/labredblack
ckeywhitelist = list("blakeryan")
/datum/gear/darksabre
name = "Dark Sabre"
category = slot_in_backpack
path = /obj/item/toy/sword/darksabre
ckeywhitelist = list("inferno707")
datum/gear/darksabresheath
name = "Dark Sabre Sheath"
category = slot_in_backpack
path = /obj/item/storage/belt/sabre/darksabre
ckeywhitelist = list("inferno707")